diff options
author | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-10-14 17:33:57 -0300 |
commit | 5d573b4f10109811b1ec7d277dfb15c548f00530 (patch) | |
tree | 3de86f0c027a29f7dfb2dac94e3d7f9251f1018b /src/leap/bitmask/config/tests/test_leapsettings.py | |
parent | 5111539437aa98660e72a19e2468b3e3fac44942 (diff) | |
parent | 584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff) |
Merge tag '0.3.4' into debian
Tag leap.bitmask version 0.3.4
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/bitmask/config/tests/test_leapsettings.py')
-rw-r--r-- | src/leap/bitmask/config/tests/test_leapsettings.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/bitmask/config/tests/test_leapsettings.py b/src/leap/bitmask/config/tests/test_leapsettings.py index 18166923..b45abfdd 100644 --- a/src/leap/bitmask/config/tests/test_leapsettings.py +++ b/src/leap/bitmask/config/tests/test_leapsettings.py @@ -29,6 +29,7 @@ import mock from leap.common.testing.basetest import BaseLeapTest from leap.bitmask.config.leapsettings import LeapSettings +from leap.bitmask.config import flags class LeapSettingsTest(BaseLeapTest): @@ -44,6 +45,7 @@ class LeapSettingsTest(BaseLeapTest): """ Test that the config file IS NOT stored under the CWD. """ + flags.STANDALONE = False self._leapsettings = LeapSettings() with mock.patch('os.listdir') as os_listdir: # use this method only to spy where LeapSettings is looking for @@ -57,7 +59,8 @@ class LeapSettingsTest(BaseLeapTest): """ Test that the config file IS stored under the CWD. """ - self._leapsettings = LeapSettings(standalone=True) + flags.STANDALONE = True + self._leapsettings = LeapSettings() with mock.patch('os.listdir') as os_listdir: # use this method only to spy where LeapSettings is looking for self._leapsettings.get_configured_providers() |