summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py')
-rw-r--r--src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py5
1 files changed, 4 insertions, 1 deletions
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()