diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
| commit | 8de591e85db21c8a189336c630408abdf7c85b1b (patch) | |
| tree | 82d9fd7daebe5ee0a1bd5d099e8249ca97340508 /src/leap/bitmask/config/tests | |
| parent | e2043a930b9ef98ad68746a2f21585901117892a (diff) | |
| parent | 1fa295ecd6af5c2ea64e76418bd144f9ddf4c803 (diff) | |
Merge tag '0.8.0' into debian/experimental
Tag leap.bitmask version 0.8.0
Conflicts:
pkg/requirements.pip
src/leap/bitmask/gui/mainwindow.py
Diffstat (limited to 'src/leap/bitmask/config/tests')
| -rw-r--r-- | src/leap/bitmask/config/tests/test_providerconfig.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/leap/bitmask/config/tests/test_providerconfig.py b/src/leap/bitmask/config/tests/test_providerconfig.py index fe27e683..7bc30f9c 100644 --- a/src/leap/bitmask/config/tests/test_providerconfig.py +++ b/src/leap/bitmask/config/tests/test_providerconfig.py @@ -258,18 +258,6 @@ class ProviderConfigTest(BaseLeapTest): pc.load(data=json_string) self.assertTrue('unknown' in pc.get_services()) - def test_get_services_string(self): - pc = self._provider_config - config = copy.deepcopy(sample_config) - config['services'] = [ - 'openvpn', 'asdf', 'openvpn', 'not_supported_service'] - json_string = json.dumps(config) - pc.load(data=json_string) - - self.assertEqual(pc.get_services_string(), - "Encrypted Internet, asdf, Encrypted Internet," - " not_supported_service") - if __name__ == "__main__": unittest.main() |