From d05b4ce551ed8a0fd631eae12ee944aee18b5a4a Mon Sep 17 00:00:00 2001 From: "Justin M. LaPre" Date: Mon, 5 Aug 2024 20:15:55 +0000 Subject: [PATCH] remove initializeTestModule_SingleInstance and all calls to that method. --- src/sst/core/testingframework/sst_unittest.py | 12 ++++++------ tests/testsuite_default_Checkpoint.py | 1 - tests/testsuite_default_Component.py | 1 - tests/testsuite_default_Links.py | 1 - tests/testsuite_default_MemPoolTest.py | 1 - tests/testsuite_default_Module.py | 1 - tests/testsuite_default_Output.py | 1 - tests/testsuite_default_ParamComponent.py | 1 - tests/testsuite_default_PerfComponent.py | 1 - tests/testsuite_default_RNGComponent.py | 1 - tests/testsuite_default_RealTime.py | 1 - tests/testsuite_default_Serialization.py | 1 - tests/testsuite_default_SharedObject.py | 1 - tests/testsuite_default_StatisticsComponent.py | 1 - tests/testsuite_default_SubComponent.py | 1 - tests/testsuite_default_UnitAlgebra.py | 1 - tests/testsuite_default_config_input_output.py | 1 - tests/testsuite_default_partitioner.py | 1 - tests/testsuite_default_sstinfo.py | 1 - tests/testsuite_testengine_testing.py | 1 - 20 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/sst/core/testingframework/sst_unittest.py b/src/sst/core/testingframework/sst_unittest.py index a027f6542..7fdf9ce0e 100644 --- a/src/sst/core/testingframework/sst_unittest.py +++ b/src/sst/core/testingframework/sst_unittest.py @@ -56,12 +56,12 @@ class SSTTestCase(unittest.TestCase): module_init = 0 module_sema = threading.Semaphore() - @classmethod - def initializeTestModule_SingleInstance(cls): - with cls.module_sema: - if cls.module_init != 1: - # Put your single instance Init Code Here - cls.module_init = 1 + # @classmethod + # def initializeTestModule_SingleInstance(cls): + # with cls.module_sema: + # if cls.module_init != 1: + # # Put your single instance Init Code Here + # cls.module_init = 1 def __init__(self, methodName): # NOTE: __init__ is called at startup for all tests before any diff --git a/tests/testsuite_default_Checkpoint.py b/tests/testsuite_default_Checkpoint.py index 3341292bf..c869c4032 100644 --- a/tests/testsuite_default_Checkpoint.py +++ b/tests/testsuite_default_Checkpoint.py @@ -22,7 +22,6 @@ class testcase_Checkpoint(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_Component.py b/tests/testsuite_default_Component.py index 77b228743..c0df17580 100644 --- a/tests/testsuite_default_Component.py +++ b/tests/testsuite_default_Component.py @@ -19,7 +19,6 @@ class testcase_Component(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_Links.py b/tests/testsuite_default_Links.py index 6eeb6b268..a799a4a6e 100644 --- a/tests/testsuite_default_Links.py +++ b/tests/testsuite_default_Links.py @@ -19,7 +19,6 @@ class testcase_Links(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_MemPoolTest.py b/tests/testsuite_default_MemPoolTest.py index a03607ce1..71b84cd69 100644 --- a/tests/testsuite_default_MemPoolTest.py +++ b/tests/testsuite_default_MemPoolTest.py @@ -22,7 +22,6 @@ class testcase_StatisticComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_Module.py b/tests/testsuite_default_Module.py index 52f63a861..d8580ac27 100644 --- a/tests/testsuite_default_Module.py +++ b/tests/testsuite_default_Module.py @@ -22,7 +22,6 @@ class testcase_Module(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_Output.py b/tests/testsuite_default_Output.py index 5670a2e01..1eef4df2b 100644 --- a/tests/testsuite_default_Output.py +++ b/tests/testsuite_default_Output.py @@ -22,7 +22,6 @@ class testcase_Output(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_ParamComponent.py b/tests/testsuite_default_ParamComponent.py index d23effd27..7e38779e7 100644 --- a/tests/testsuite_default_ParamComponent.py +++ b/tests/testsuite_default_ParamComponent.py @@ -19,7 +19,6 @@ class testcase_ParamComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_PerfComponent.py b/tests/testsuite_default_PerfComponent.py index 38d6a5ddb..6dcf4ebe8 100644 --- a/tests/testsuite_default_PerfComponent.py +++ b/tests/testsuite_default_PerfComponent.py @@ -20,7 +20,6 @@ class testcase_PerfComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_RNGComponent.py b/tests/testsuite_default_RNGComponent.py index 2bd0fe4a1..de2bcdcb8 100644 --- a/tests/testsuite_default_RNGComponent.py +++ b/tests/testsuite_default_RNGComponent.py @@ -22,7 +22,6 @@ class testcase_RNGComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_RealTime.py b/tests/testsuite_default_RealTime.py index 5e9afe281..2d057613e 100644 --- a/tests/testsuite_default_RealTime.py +++ b/tests/testsuite_default_RealTime.py @@ -36,7 +36,6 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_Serialization.py b/tests/testsuite_default_Serialization.py index f45f5cd0d..b9d11a396 100644 --- a/tests/testsuite_default_Serialization.py +++ b/tests/testsuite_default_Serialization.py @@ -22,7 +22,6 @@ class testcase_Serialization(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_SharedObject.py b/tests/testsuite_default_SharedObject.py index 3570793c2..c40ec0416 100644 --- a/tests/testsuite_default_SharedObject.py +++ b/tests/testsuite_default_SharedObject.py @@ -22,7 +22,6 @@ class testcase_SharedObject(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_StatisticsComponent.py b/tests/testsuite_default_StatisticsComponent.py index efd3d9896..a430a01ae 100644 --- a/tests/testsuite_default_StatisticsComponent.py +++ b/tests/testsuite_default_StatisticsComponent.py @@ -26,7 +26,6 @@ class testcase_StatisticComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_SubComponent.py b/tests/testsuite_default_SubComponent.py index 82efabf67..339b6c5d0 100644 --- a/tests/testsuite_default_SubComponent.py +++ b/tests/testsuite_default_SubComponent.py @@ -22,7 +22,6 @@ class testcase_SubComponent(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_UnitAlgebra.py b/tests/testsuite_default_UnitAlgebra.py index 7039329b4..091978361 100644 --- a/tests/testsuite_default_UnitAlgebra.py +++ b/tests/testsuite_default_UnitAlgebra.py @@ -19,7 +19,6 @@ class testcase_UnitAlgebra(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_config_input_output.py b/tests/testsuite_default_config_input_output.py index a1e570c13..bbc7d1b4e 100644 --- a/tests/testsuite_default_config_input_output.py +++ b/tests/testsuite_default_config_input_output.py @@ -25,7 +25,6 @@ class testcase_Config_input_output(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_partitioner.py b/tests/testsuite_default_partitioner.py index 2fc698c95..a3adfb200 100644 --- a/tests/testsuite_default_partitioner.py +++ b/tests/testsuite_default_partitioner.py @@ -22,7 +22,6 @@ class testcase_Partitioners(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_default_sstinfo.py b/tests/testsuite_default_sstinfo.py index 9f2f2fe59..a7de57b38 100644 --- a/tests/testsuite_default_sstinfo.py +++ b/tests/testsuite_default_sstinfo.py @@ -22,7 +22,6 @@ class testcase_sstinfo(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): diff --git a/tests/testsuite_testengine_testing.py b/tests/testsuite_testengine_testing.py index c0496d26a..5b0d60d0c 100644 --- a/tests/testsuite_testengine_testing.py +++ b/tests/testsuite_testengine_testing.py @@ -23,7 +23,6 @@ class testcase_testengine_testing_frameworks_operation(SSTTestCase): def setUp(self): super(type(self), self).setUp() - type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self):