diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-20 11:30:32 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-20 11:30:32 -0300 |
| commit | 1662a500c8367478cac54e71feae9c239cec4bd3 (patch) | |
| tree | 97fc863c7c3f6e9e9d7a38f690802cfbc6d2a55f | |
| parent | c2487b80fb33ba5a61edf9470075bdf130a003f0 (diff) | |
| parent | 8702e7bb2fc92fd85b7b1409b40430d25524538e (diff) | |
Merge remote-tracking branch 'ivan/bug/update-failing-test-and-pep8' into develop
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/tests/test_eipconfig.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index ef39181b..e84b7a7b 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1090,8 +1090,6 @@ class MainWindow(QtGui.QMainWindow): #self._status_panel.set_eip_status( # self.tr("MX is disabled")) - - def _get_socket_host(self): """ Returns the socket and port to be used for VPN diff --git a/src/leap/bitmask/services/eip/tests/test_eipconfig.py b/src/leap/bitmask/services/eip/tests/test_eipconfig.py index f8489e07..76305e83 100644 --- a/src/leap/bitmask/services/eip/tests/test_eipconfig.py +++ b/src/leap/bitmask/services/eip/tests/test_eipconfig.py @@ -30,8 +30,7 @@ from mock import Mock sample_config = { - "gateways": [ - { + "gateways": [{ "capabilities": { "adblock": False, "filter_dns": True, 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() |