load all test classes

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>

lib/cdist/test/__main__.py

@@ -1,3 +1,4 @@
+#c1406:!/usr/bin/env python3
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
@@ -20,27 +21,29 @@
 #
 #
 
-
+import imp
 import os
 import sys
-import cdist.test
 import unittest
 
-#class UI(unittest.TestCase):
-#    def test_banner(self):
-#        self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)
-#
-#    def test_help(self):
-#        for cmd in cdist_commands:
-#            self.assertEqual(subprocess.call([cdist_exec_path, cmd, "-h"]), 0)
-#
-#    # FIXME: mockup needed
-#    def test_config_localhost(self):
-#        for cmd in cdist_commands:
-#            self.assertEqual(subprocess.call([cdist_exec_path, "config", "localhost"]), 0)
+base_dir = os.path.dirname(os.path.realpath(__file__))
+
+test_modules = []
+for possible_test in os.listdir(base_dir):
+    filename = "__init__.py"
+    mod_path = os.path.join(base_dir, possible_test, filename)
+
+    print(mod_path + "x")
+
+    if os.path.isfile(mod_path):
+        test_modules.append(possible_test)
+
+print(sys.path)
+
+for test_module in test_modules:
+    module = imp.find_module(test_module, [base_dir])
+    imp.load_module(test_module, *module)
+
+#suite = unittest.defaultTestLoader.loadTestsFromModule(cdist.test.code)
 
-print(cdist.test.cdist_exec_path)
-print(sys.argv)
 
-suite = unittest.defaultTestLoader.discover(os.path.dirname(__file__))
-unittest.TextTestRunner(verbosity=1).run(suite)

lib/cdist/test/nico_ui.py

@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-
-import os
-import subprocess
-import unittest
-
-cdist_commands=["banner", "config", "install"]
-
-cdist_exec_path = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.realpath(__file__)), "../bin/cdist"))
-
-class UI(unittest.TestCase):
-    def test_banner(self):
-        self.assertEqual(subprocess.call([cdist_exec_path, "banner"]), 0)
-
-    def test_help(self):
-        for cmd in cdist_commands:
-            self.assertEqual(subprocess.call([cdist_exec_path, cmd, "-h"]), 0)
-
-    # FIXME: mockup needed
-    def test_config_localhost(self):
-        for cmd in cdist_commands:
-            self.assertEqual(subprocess.call([cdist_exec_path, "config", "localhost"]), 0)
-