Merge branch 'develop' of ssh://leap.se/leap_client into develop

4 files changed, 39 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 49bbc061..09d0661c 100755
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ import versioneer
 versioneer.versionfile_source = 'src/leap/bitmask/_version.py'
 versioneer.versionfile_build = 'leap/bitmask/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
-#versioneer.parentdir_prefix = 'bitmask-'
+versioneer.parentdir_prefix = 'leap.bitmask-'
 
 #from setuptools import Command
 
diff --git a/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
index 6c5c6e57..b0685676 100644
--- a/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
@@ -444,6 +444,25 @@ class ProviderBootstrapperActiveTest(unittest.TestCase):
         self.assertFalse(ProviderConfig.save.called)
 
     @mock.patch(
+        'leap.bitmask.config.providerconfig.ProviderConfig.get_domain',
+        lambda x: where('testdomain.com'))
+    def test_download_provider_info_not_modified_and_no_cacert(self):
+        self._setup_provider_config_with("1", tempfile.mkdtemp())
+        self._setup_providerbootstrapper(True)
+        provider_path = self._produce_dummy_provider_json()
+
+        # set mtime to something really new
+        os.utime(provider_path, (-1, time.time()))
+
+        with mock.patch.object(
+                ProviderConfig, 'get_api_uri',
+                return_value="https://localhost:%s" % (self.https_port,)):
+            self.pb._download_provider_info()
+        # we check that it doesn't save the provider
+        # config, because it's new enough
+        self.assertFalse(ProviderConfig.save.called)
+
+    @mock.patch(
         'leap.bitmask.config.providerconfig.ProviderConfig.get_ca_cert_path',
         lambda x: where('cacert.pem'))
     def test_download_provider_info_modified(self):
diff --git a/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
index f9a177a9..36f8a076 100644
--- a/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
+++ b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
@@ -19,6 +19,7 @@ tests for vpngatewayselector
 """
 
 import unittest
+import time
 
 from leap.bitmask.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
 from leap.common.testing.basetest import BaseLeapTest
@@ -128,5 +129,19 @@ class VPNGatewaySelectorTest(BaseLeapTest):
         self.assertEqual(gateways, [ips[4], ips[2], ips[3], ips[1]])
 
 
+class VPNGatewaySelectorDSTTest(VPNGatewaySelectorTest):
+    """
+    VPNGatewaySelector's tests.
+    It uses the opposite value of the current DST.
+    """
+    def setUp(self):
+        self._original_daylight = time.daylight
+        time.daylight = not time.daylight
+        VPNGatewaySelectorTest.setUp(self)
+
+    def tearDown(self):
+        VPNGatewaySelectorTest.tearDown(self)
+        time.daylight = self._original_daylight
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/leap/bitmask/util/tests/test_streamtologger.py b/src/leap/bitmask/util/tests/test_streamtologger.py
index c4e55b3a..fc97b794 100644
--- a/src/leap/bitmask/util/tests/test_streamtologger.py
+++ b/src/leap/bitmask/util/tests/test_streamtologger.py
@@ -117,6 +117,10 @@ class StreamToLoggerTest(BaseLeapTest):
         self.assertEqual(log, message)
         self.assertEqual(log_level, logging.ERROR)
 
+    def test_twisted_log(self):
+        from twisted.python import log
+        log.startLogging(sys.stdout)
+
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)