summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-22 07:12:03 +0900
committerkali <kali@leap.se>2012-08-22 07:12:03 +0900
commit04676d5869c33a419d199b1be7dbb616c31434c2 (patch)
tree815eb572a772897719f0b4307b5de964003e4732
parentb5f7999e43e2c6504b43534e03bfc5a130dfac87 (diff)
moved json-config tests
-rw-r--r--src/leap/eip/tests/test_config.py9
-rw-r--r--src/leap/eip/tests/tests_config.py19
2 files changed, 9 insertions, 19 deletions
diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py
index 11433777..051faa29 100644
--- a/src/leap/eip/tests/test_config.py
+++ b/src/leap/eip/tests/test_config.py
@@ -204,6 +204,15 @@ class EIPConfigTest(unittest.TestCase):
self.assertEqual(command, 'openvpn')
self.assertEqual(args, self.get_expected_openvpn_args())
+ # json config
+
+ def test_get_config_json(self):
+ config_js = config.get_config_json()
+ self.assertTrue(isinstance(config_js, dict))
+ self.assertTrue('transport' in config_js)
+ self.assertTrue('provider' in config_js)
+ self.assertEqual(config_js['provider'], "testprovider.org")
+
if __name__ == "__main__":
unittest.main()
diff --git a/src/leap/eip/tests/tests_config.py b/src/leap/eip/tests/tests_config.py
deleted file mode 100644
index 5a0e2d94..00000000
--- a/src/leap/eip/tests/tests_config.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-"""Test config helper functions"""
-
-import unittest
-
-from leap.eip import config
-
-
-class TestConfig(unittest.TestCase):
- """
- Test configuration help functions.
- """
-
- def test_get_config_json(self):
- config_js = config.get_config_json()
- self.assertTrue(isinstance(config_js, dict))
- self.assertTrue('transport' in config_js)
- self.assertTrue('provider' in config_js)
- self.assertEqual(config_js['provider'], "testprovider.org")