Merge branch 'develop' of ssh://leap.se:4422/leap-client into get-definition.json

4 files changed, 134 insertions, 19 deletions

diff --git a/src/leap/eip/tests/test_config.py b/src/leap/eip/tests/test_config.py
index 051faa2..b4ad66e 100644
--- a/src/leap/eip/tests/test_config.py
+++ b/src/leap/eip/tests/test_config.py
@@ -10,35 +10,22 @@ try:
 except ImportError:
     import unittest
 
+from leap.testing.basetest import BaseLeapTest
 from leap.eip import config
 
 _system = platform.system()
 
 
-class NotImplementedError(Exception):
-    pass
-
-# XXX use mock_open here?
-
-
-class EIPConfigTest(unittest.TestCase):
+class EIPConfigTest(BaseLeapTest):
 
     __name__ = "eip_config_tests"
 
     def setUp(self):
-        self.old_path = os.environ['PATH']
-
-        self.tdir = tempfile.mkdtemp()
-
-        bin_tdir = os.path.join(
-            self.tdir,
-            'bin')
-        os.mkdir(bin_tdir)
-        os.environ['PATH'] = bin_tdir
+        pass
 
     def tearDown(self):
-        os.environ['PATH'] = self.old_path
-        shutil.rmtree(self.tdir)
+        pass
+
     #
     # helpers
     #
@@ -58,7 +45,7 @@ class EIPConfigTest(unittest.TestCase):
 
     def touch_exec(self):
         tfile = os.path.join(
-            self.tdir,
+            self.tempfile,
             'bin',
             'openvpn')
         open(tfile, 'bw').close()
diff --git a/src/leap/testing/__init__.py b/src/leap/testing/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/leap/testing/__init__.py
diff --git a/src/leap/testing/basetest.py b/src/leap/testing/basetest.py
new file mode 100644
index 0000000..ccf1a76
--- /dev/null
+++ b/src/leap/testing/basetest.py
@@ -0,0 +1,37 @@
+import os
+import shutil
+import tempfile
+
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+
+class BaseLeapTest(unittest.TestCase):
+
+    __name__ = "leap_test"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.old_path = os.environ['PATH']
+        cls.tempdir = tempfile.mkdtemp()
+        bin_tdir = os.path.join(
+            cls.tempdir,
+            'bin')
+        os.environ["PATH"] = bin_tdir
+
+    @classmethod
+    def tearDownClass(cls):
+        os.environ["PATH"] = cls.old_path
+        shutil.rmtree(cls.tempdir)
+
+    def setUp(self):
+        raise NotImplementedError("abstract base class")
+
+    def tearDown(self):
+        raise NotImplementedError("abstract base class")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/src/leap/testing/test_basetest.py b/src/leap/testing/test_basetest.py
new file mode 100644
index 0000000..14d8f8a
--- /dev/null
+++ b/src/leap/testing/test_basetest.py
@@ -0,0 +1,91 @@
+"""becase it's oh so meta"""
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
+import os
+import StringIO
+
+from leap.testing.basetest import BaseLeapTest
+
+# global for tempdir checking
+_tempdir = None
+
+
+class _TestCaseRunner(object):
+    def run_testcase(self, testcase=None):
+        if not testcase:
+            return None
+        loader = unittest.TestLoader()
+        suite = loader.loadTestsFromTestCase(testcase)
+
+        # Create runner, and run testcase
+        io = StringIO.StringIO()
+        runner = unittest.TextTestRunner(stream=io)
+        results = runner.run(suite)
+        return results
+
+
+class TestAbstractBaseLeapTest(unittest.TestCase, _TestCaseRunner):
+
+    def test_abstract_base_class(self):
+        class _BaseTest(BaseLeapTest):
+            def test_dummy_method(self):
+                pass
+
+            def test_tautology(self):
+                assert True
+
+        results = self.run_testcase(_BaseTest)
+
+        # should be 2 errors: NotImplemented
+        # raised for setUp/tearDown
+        self.assertEquals(results.testsRun, 2)
+        self.assertEquals(len(results.failures), 0)
+        self.assertEquals(len(results.errors), 2)
+
+
+class TestInitBaseLeapTest(BaseLeapTest):
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def test_path_is_changed(self):
+        os_path = os.environ['PATH']
+        self.assertTrue(os_path.startswith(self.tempdir))
+
+    def test_old_path_is_saved(self):
+        self.assertTrue(len(self.old_path) > 1)
+
+
+class TestCleanedBaseLeapTest(unittest.TestCase, _TestCaseRunner):
+
+    def test_tempdir_is_cleaned_after_tests(self):
+        class _BaseTest(BaseLeapTest):
+            def setUp(self):
+                global _tempdir
+                _tempdir = self.tempdir
+
+            def tearDown(self):
+                pass
+
+            def test_tempdir_created(self):
+                self.assertTrue(os.path.isdir(self.tempdir))
+
+            def test_tempdir_created_on_setupclass(self):
+                self.assertEqual(_tempdir, self.tempdir)
+
+        results = self.run_testcase(_BaseTest)
+        self.assertEquals(results.testsRun, 2)
+        self.assertEquals(len(results.failures), 0)
+        self.assertEquals(len(results.errors), 0)
+
+        # did we cleaned the tempdir?
+        self.assertFalse(os.path.isdir(_tempdir))
+
+if __name__ == "__main__":
+    unittest.main()