diff options
author | kali <kali@leap.se> | 2012-12-12 04:26:16 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2012-12-12 04:26:16 +0900 |
commit | b262ac8bae66c391aa249e93268db9935f1c475f (patch) | |
tree | 3d39b48495fbcfbfeab776af07558c345f4161cb /src/leap/base/tests/test_providers.py | |
parent | cd78d9d552977e8f8fb12b6a2ff56fda9c37bf35 (diff) | |
parent | 04d423e2a89034dfb86fe305108162fd2a696079 (diff) |
Merge branch 'feature/openvpn-ciphers' into develop
Diffstat (limited to 'src/leap/base/tests/test_providers.py')
-rw-r--r-- | src/leap/base/tests/test_providers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/base/tests/test_providers.py b/src/leap/base/tests/test_providers.py index 15c4ed58..d9604fab 100644 --- a/src/leap/base/tests/test_providers.py +++ b/src/leap/base/tests/test_providers.py @@ -8,7 +8,7 @@ import os import jsonschema -from leap import __branding as BRANDING +#from leap import __branding as BRANDING from leap.testing.basetest import BaseLeapTest from leap.base import providers @@ -33,8 +33,8 @@ class TestLeapProviderDefinition(BaseLeapTest): self.domain = "testprovider.example.org" self.definition = providers.LeapProviderDefinition( domain=self.domain) - self.definition.save() - self.definition.load() + self.definition.save(force=True) + self.definition.load() # why have to load after save?? self.config = self.definition.config def tearDown(self): @@ -61,7 +61,7 @@ class TestLeapProviderDefinition(BaseLeapTest): def test_provider_dump(self): # check a good provider definition is dumped to disk self.testfile = self.get_tempfile('test.json') - self.definition.save(to=self.testfile) + self.definition.save(to=self.testfile, force=True) deserialized = json.load(open(self.testfile, 'rb')) self.maxDiff = None self.assertEqual(deserialized, EXPECTED_DEFAULT_CONFIG) |