Skip to content

Commit fa18381

Browse files
committed
Allow passing arguments to unittest
1 parent ac204f8 commit fa18381

Some content is hidden

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

42 files changed

+231
-99
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().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
@@ -438,9 +438,12 @@ def test_raise_nosupport(self):
438438
raise_nosupport, 'foobar', 42)
439439

440440

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

445448

446449
if __name__ == '__main__':

test/framework/config.py

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

732732

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

736739

737740
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
@@ -1407,9 +1407,12 @@ def get_eb_help_output(arg=''):
14071407
self.assertTrue(regex.search(txt_rst), "Pattern '%s' should be found in: %s" % (regex.pattern, txt_rst))
14081408

14091409

1410-
def suite():
1410+
def suite(loader=None):
14111411
""" returns all test cases in this module """
1412-
return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
1412+
if loader:
1413+
return loader.loadTestsFromTestCase(DocsTest)
1414+
else:
1415+
return TestLoaderFiltered().loadTestsFromTestCase(DocsTest, sys.argv[1:])
14131416

14141417

14151418
if __name__ == '__main__':

test/framework/easyblock.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3593,9 +3593,12 @@ def custom_step(self):
35933593
self.assertIn('Ran custom', logtxt)
35943594

35953595

3596-
def suite():
3596+
def suite(loader=None):
35973597
""" return all the tests in this file """
3598-
return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
3598+
if loader:
3599+
return loader.loadTestsFromTestCase(EasyBlockTest)
3600+
else:
3601+
return TestLoaderFiltered().loadTestsFromTestCase(EasyBlockTest, sys.argv[1:])
35993602

36003603

36013604
if __name__ == '__main__':

test/framework/easyconfig.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5257,9 +5257,12 @@ def test_templates(self):
52575257
self.assertRegex(stderr.getvalue(), regex)
52585258

52595259

5260-
def suite():
5260+
def suite(loader=None):
52615261
""" returns all the testcases in this module """
5262-
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
5262+
if loader:
5263+
return loader.loadTestsFromTestCase(EasyConfigTest)
5264+
else:
5265+
return TestLoaderFiltered().loadTestsFromTestCase(EasyConfigTest, sys.argv[1:])
52635266

52645267

52655268
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
@@ -222,9 +222,12 @@ def test_check_value_types(self):
222222
self.assertEqual(ecdict['version'], '1.4')
223223

224224

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

229232

230233
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)