From 8702e7bb2fc92fd85b7b1409b40430d25524538e Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 20 Aug 2013 11:22:31 -0300 Subject: Update failing test, pep8 fixes. --- src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py') diff --git a/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py index 93467d3a..6c5c6e57 100644 --- a/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py +++ b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py @@ -64,7 +64,10 @@ class ProviderBootstrapperTest(BaseLeapTest): self.pb._check_name_resolution() # Something highly likely to fail self.pb._domain = "uquhqweuihowquie.abc.def" - with self.assertRaises(socket.gaierror): + + # In python 2.7.4 raises socket.error + # In python 2.7.5 raises socket.gaierror + with self.assertRaises((socket.gaierror, socket.error)): self.pb._check_name_resolution() @deferred() -- cgit v1.2.3