Skip to content

Commit f8b2f54

Browse files
committed
Allow passing arguments to unittest
1 parent 77bff77 commit f8b2f54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+236
-101
lines changed

test/framework/asyncprocess.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,12 @@ def tearDown(self):
6767
super(AsyncProcessTest, self).tearDown()
6868

6969

70-
def suite():
70+
def suite(loader=None):
7171
""" returns all the testcases in this module """
72-
return TestLoaderFiltered().loadTestsFromTestCase(AsyncProcessTest, sys.argv[1:])
72+
if loader:
73+
return loader.loadTestsFromTestCase(AsyncProcessTest)
74+
else:
75+
return TestLoaderFiltered().loadTestsFromTestCase(AsyncProcessTest, sys.argv[1:])
7376

7477

7578
if __name__ == '__main__':

test/framework/build_log.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,12 @@ def test_raise_nosupport(self):
437437
raise_nosupport, 'foobar', 42)
438438

439439

440-
def suite():
440+
def suite(loader=None):
441441
""" returns all the testcases in this module """
442-
return TestLoaderFiltered().loadTestsFromTestCase(BuildLogTest, sys.argv[1:])
442+
if loader:
443+
return loader.loadTestsFromTestCase(BuildLogTest)
444+
else:
445+
return TestLoaderFiltered().loadTestsFromTestCase(BuildLogTest, sys.argv[1:])
443446

444447

445448
if __name__ == '__main__':

test/framework/config.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,11 @@ def test_update_build_options(self):
731731
self.assertEqual(build_option('pr_target_account'), 'easybuilders')
732732

733733

734-
def suite():
735-
return TestLoaderFiltered().loadTestsFromTestCase(EasyBuildConfigTest, sys.argv[1:])
734+
def suite(loader=None):
735+
if loader:
736+
return loader.loadTestsFromTestCase(EasyBuildConfigTest)
737+
else:
738+
return TestLoaderFiltered().loadTestsFromTestCase(EasyBuildConfigTest, sys.argv[1:])
736739

737740

738741
if __name__ == '__main__':

test/framework/containers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,12 @@ def test_container_config_template_recipe(self):
509509
self.assertEqual(cont_recipe, expected)
510510

511511

512-
def suite():
512+
def suite(loader=None):
513513
""" returns all the testcases in this module """
514-
return TestLoaderFiltered().loadTestsFromTestCase(ContainersTest, sys.argv[1:])
514+
if loader:
515+
return loader.loadTestsFromTestCase(ContainersTest)
516+
else:
517+
return TestLoaderFiltered().loadTestsFromTestCase(ContainersTest, sys.argv[1:])
515518

516519

517520
if __name__ == '__main__':

test/framework/docs.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,9 +1067,12 @@ def get_eb_help_output(arg=''):
10671067
self.assertTrue(regex.search(txt_rst), "Pattern '%s' should be found in: %s" % (regex.pattern, txt_rst))
10681068

10691069

1070-
def suite():
1070+
def suite(loader=None):
10711071
""" returns all test cases in this module """
1072-
return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
1072+
if loader:
1073+
return loader.loadTestsFromTestCase(DocsTest)
1074+
else:
1075+
return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
10731076

10741077

10751078
if __name__ == '__main__':

test/framework/easyblock.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2762,9 +2762,12 @@ def run_sanity_check_step(sanity_check_paths, enhance_sanity_check):
27622762
run_sanity_check_step({}, True)
27632763

27642764

2765-
def suite():
2765+
def suite(loader=None):
27662766
""" return all the tests in this file """
2767-
return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
2767+
if loader:
2768+
return loader.loadTestsFromTestCase(EasyBlockTest)
2769+
else:
2770+
return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
27682771

27692772

27702773
if __name__ == '__main__':

test/framework/easyconfig.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4783,9 +4783,12 @@ def test_easyconfigs_caches(self):
47834783
self.assertTrue(regex.search(stdout), "Pattern '%s' should be found in: %s" % (regex.pattern, stdout))
47844784

47854785

4786-
def suite():
4786+
def suite(loader=None):
47874787
""" returns all the testcases in this module """
4788-
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
4788+
if loader:
4789+
return loader.loadTestsFromTestCase(EasyConfigTest)
4790+
else:
4791+
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
47894792

47904793

47914794
if __name__ == '__main__':

test/framework/easyconfigformat.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,12 @@ def test_parser_version_regex(self):
4646
self.assertEqual(version['minor'], int(res['minor']))
4747

4848

49-
def suite():
49+
def suite(loader=None):
5050
""" returns all the testcases in this module """
51-
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigFormatTest, sys.argv[1:])
51+
if loader:
52+
return loader.loadTestsFromTestCase(EasyConfigFormatTest)
53+
else:
54+
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigFormatTest, sys.argv[1:])
5255

5356

5457
if __name__ == '__main__':

test/framework/easyconfigparser.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,12 @@ def test_check_value_types(self):
223223
self.assertEqual(ecdict['version'], '1.4')
224224

225225

226-
def suite():
226+
def suite(loader=None):
227227
""" returns all the testcases in this module """
228-
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigParserTest, sys.argv[1:])
228+
if loader:
229+
return loader.loadTestsFromTestCase(EasyConfigParserTest)
230+
else:
231+
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigParserTest, sys.argv[1:])
229232

230233

231234
if __name__ == '__main__':

test/framework/easyconfigversion.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,12 @@ def test_hashing(self):
285285
self.assertTrue(hash(test_case))
286286

287287

288-
def suite():
288+
def suite(loader=None):
289289
""" returns all the testcases in this module """
290-
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigVersion, sys.argv[1:])
290+
if loader:
291+
return loader.loadTestsFromTestCase(EasyConfigVersion)
292+
else:
293+
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigVersion, sys.argv[1:])
291294

292295

293296
if __name__ == '__main__':

0 commit comments

Comments
 (0)