summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/config/tests/test_leapsettings.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-01 11:53:12 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-01 11:53:12 -0300
commit95b69d0d2e9801e4db1fe3758b62ab9539ecf882 (patch)
tree81a6b3d7d8a70e4355b97a0cb2b3b61102a59e1e /src/leap/bitmask/config/tests/test_leapsettings.py
parent487993d08cc2e12fdb9c9edcddff5727479e815d (diff)
parent924264776e8dab3c17c09a3188ae701edbaf797b (diff)
Merge remote-tracking branch 'ivan/feature/update-failing-tests' into develop
Diffstat (limited to 'src/leap/bitmask/config/tests/test_leapsettings.py')
-rw-r--r--src/leap/bitmask/config/tests/test_leapsettings.py5
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()