summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-09 01:21:22 +0900
committerkali <kali@leap.se>2012-08-09 01:21:22 +0900
commitb4ede273de57e0197d61fe9eef8e141de9d9225d (patch)
treec97320fcdf4ed28a748c87d1ff4a35dc9e7bf095
parentbda0f214d13387e4efceb127f0a8bbb37935f98c (diff)
moar eip.config tests
-rw-r--r--src/leap/eip/config.py6
-rw-r--r--src/leap/eip/test_config.py71
2 files changed, 72 insertions, 5 deletions
diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 6118c9d..52f2147 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -13,7 +13,7 @@ from leap.baseapp.permcheck import (is_pkexec_in_system,
logger = logging.getLogger(name=__name__)
logger.setLevel('DEBUG')
-# XXX move exceptions to
+# XXX move exceptions:
# from leap.eip import exceptions as eip_exceptions
@@ -203,10 +203,6 @@ def build_ovpn_options(daemon=False):
opts = []
- #moved to config files
- #opts.append('--persist-tun')
- #opts.append('--persist-key')
-
# set user and group
opts.append('--user')
opts.append('%s' % user)
diff --git a/src/leap/eip/test_config.py b/src/leap/eip/test_config.py
new file mode 100644
index 0000000..997b05e
--- /dev/null
+++ b/src/leap/eip/test_config.py
@@ -0,0 +1,71 @@
+import os
+import platform
+import unittest
+
+from leap.eip import config
+
+
+class NotImplementedError(Exception):
+ pass
+
+
+class EIPConfigTest(unittest.TestCase):
+
+ def setUp(self):
+ self.system = platform.system()
+ self.old_path = os.environ['PATH']
+ # XXX mktemp
+ # XXX os.environ['PATH'] = ...
+
+ def tearDown(self):
+ os.environ['PATH'] = self.old_path
+ #
+ # helpers
+ #
+
+ def get_username(self):
+ return os.getlogin()
+
+ def raise_not_implemented_for_this(self):
+ raise NotImplementedError(
+ "This test is not implemented "
+ "for the running platform: %s" %
+ self.system)
+
+ #
+ # tests
+ #
+
+ # XXX fixme! /home/user should
+ # be replaced for proper home lookup.
+
+ def test_get_config_file(self):
+ if self.system == "Linux":
+ self.assertEqual(
+ config.get_config_file(
+ 'test', folder="foo/bar"),
+ '/home/%s/.config/leap/foo/bar/test' %
+ self.get_username())
+ else:
+ self.missing_test_for_plat()
+
+ def test_get_config_dir(self):
+ if self.system == "Linux":
+ self.assertEqual(
+ config.get_config_dir(),
+ '/home/%s/.config/leap' %
+ self.get_username())
+ else:
+ self.missing_test_for_plat()
+
+ def test_get_default_provider_path(self):
+ if self.system == "Linux":
+ self.assertEqual(
+ config.get_default_provider_path(),
+ '/home/%s/.config/leap/providers/default/' %
+ self.get_username())
+ else:
+ self.missing_test_for_plat()
+
+ def test_validate_ip(self):
+ config.validate_ip('3.3.3.3')