Merge pull request #3790 from Flamefire/test-suite-improvements

add support for passing valid unittest options to test suite

Author: boegel

test/framework/asyncprocess.py

@@ -67,9 +67,12 @@ def tearDown(self):
         super().tearDown()
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(AsyncProcessTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(AsyncProcessTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(AsyncProcessTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/build_log.py

@@ -438,9 +438,12 @@ def test_raise_nosupport(self):
                               raise_nosupport, 'foobar', 42)
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(BuildLogTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(BuildLogTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(BuildLogTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/config.py

@@ -730,8 +730,11 @@ def test_update_build_options(self):
         self.assertEqual(build_option('pr_target_account'), 'easybuilders')
 
 
-def suite():
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyBuildConfigTest, sys.argv[1:])
+def suite(loader=None):
+    if loader:
+        return loader.loadTestsFromTestCase(EasyBuildConfigTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyBuildConfigTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/containers.py

@@ -509,9 +509,12 @@ def test_container_config_template_recipe(self):
         self.assertEqual(cont_recipe, expected)
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(ContainersTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(ContainersTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(ContainersTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/docs.py

@@ -1407,9 +1407,12 @@ def get_eb_help_output(arg=''):
             self.assertTrue(regex.search(txt_rst), "Pattern '%s' should be found in: %s" % (regex.pattern, txt_rst))
 
 
-def suite():
+def suite(loader=None):
     """ returns all test cases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(DocsTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/easyblock.py

@@ -3593,9 +3593,12 @@ def custom_step(self):
         self.assertIn('Ran custom', logtxt)
 
 
-def suite():
+def suite(loader=None):
     """ return all the tests in this file """
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(EasyBlockTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/easyconfig.py

@@ -5257,9 +5257,12 @@ def test_templates(self):
         self.assertRegex(stderr.getvalue(), regex)
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(EasyConfigTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/easyconfigformat.py

@@ -46,9 +46,12 @@ def test_parser_version_regex(self):
         self.assertEqual(version['minor'], int(res['minor']))
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigFormatTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(EasyConfigFormatTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigFormatTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/easyconfigparser.py

@@ -222,9 +222,12 @@ def test_check_value_types(self):
         self.assertEqual(ecdict['version'], '1.4')
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigParserTest, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(EasyConfigParserTest)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigParserTest, sys.argv[1:])
 
 
 if __name__ == '__main__':

test/framework/easyconfigversion.py

@@ -285,9 +285,12 @@ def test_hashing(self):
             self.assertTrue(hash(test_case))
 
 
-def suite():
+def suite(loader=None):
     """ returns all the testcases in this module """
-    return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigVersion, sys.argv[1:])
+    if loader:
+        return loader.loadTestsFromTestCase(EasyConfigVersion)
+    else:
+        return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigVersion, sys.argv[1:])
 
 
 if __name__ == '__main__':