Update run_all tests to make it run in pycharm

don4get · don4get · commit d8e57780febf · 2019-04-13T14:30:51.000+02:00
diff --git a/control/tests/run_all.py b/control/tests/run_all.py
@@ -8,23 +8,20 @@
 import re                       # regular expressions
 import os                       # operating system commands
 
+
 def test_all(verbosity=0):
     """ Runs all tests written for python-control.
     """
     try:                      # autodiscovery (python 2.7+)
         start_dir = './'
         pattern = '*_test.py'
         top_level_dir = '../'
-        testModules = \
-            unittest.defaultTestLoader.discover(start_dir, pattern=pattern, \
-                                                top_level_dir=top_level_dir)
-
-        for mod in test_mods:
-            print('Running tests in', mod)
-            tests = unittest.defaultTestLoader.loadTestFromModule(mod)
+        test_mods = unittest.defaultTestLoader.discover(start_dir, pattern=pattern,
+                                                        top_level_dir=top_level_dir)
+        for suite in test_mods:
+            print("Running tests in: ", suite)
             t = unittest.TextTestRunner()
-            t.run(tests)
-            print('Completed tests in', mod)
+            t.run(suite)
 
     except:
         testModules = findTests('./tests/')
@@ -33,8 +30,8 @@ def test_all(verbosity=0):
         for mod in testModules:
             print('Running tests in', mod)
             suiteList=[]        # list of unittest.TestSuite objects
-            exec('import '+mod+' as currentModule')
-
+            exec('import control.tests.'+mod+' as currentModule')
+            print(currentModule.suite())
             try:
                 currentSuite = currentModule.suite()
                 if isinstance(currentSuite, unittest.TestSuite):
