diff --git a/tests/testsuite_default_Checkpoint.py b/tests/testsuite_default_Checkpoint.py index f46a02d42..92c97bbea 100644 --- a/tests/testsuite_default_Checkpoint.py +++ b/tests/testsuite_default_Checkpoint.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Checkpoint(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self): @@ -168,7 +151,7 @@ def checkpoint_test_template(self, testtype, cptfreq, cptrestart, subcomp=False, sdlfile_generate = "{0}/subcomponent_tests/test_{1}.py".format(testsuitedir, testtype) else: sdlfile_generate = "{0}/test_{1}.py".format(testsuitedir,testtype) - outfile_generate = "{0}/test_Checkpoint_{1}_generate.out".format(outdir, outstr) + outfile_generate = "{0}/test_Checkpoint_{1}_generate.out".format(outdir, teststr) options_checkpoint="--checkpoint-sim-period={0} --checkpoint-prefix={1} --model-options='{2}'".format(cptfreq,teststr,modelparams) self.run_sst(sdlfile_generate, outfile_generate, other_args=options_checkpoint) diff --git a/tests/testsuite_default_Component.py b/tests/testsuite_default_Component.py index 7aa37c9dd..64836b109 100644 --- a/tests/testsuite_default_Component.py +++ b/tests/testsuite_default_Component.py @@ -14,23 +14,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Component(SSTTestCase): @@ -41,7 +24,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 119a42553..5d6372683 100644 --- a/tests/testsuite_default_Links.py +++ b/tests/testsuite_default_Links.py @@ -14,23 +14,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Links(SSTTestCase): @@ -41,7 +24,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 d62f7c4a1..a6cd33b78 100644 --- a/tests/testsuite_default_MemPoolTest.py +++ b/tests/testsuite_default_MemPoolTest.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_StatisticComponent(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 cdfb91896..35fa69e19 100644 --- a/tests/testsuite_default_Module.py +++ b/tests/testsuite_default_Module.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Module(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 1837ecbc8..1d91fc2b6 100644 --- a/tests/testsuite_default_Output.py +++ b/tests/testsuite_default_Output.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Output(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 096ed942d..4537eb69d 100644 --- a/tests/testsuite_default_ParamComponent.py +++ b/tests/testsuite_default_ParamComponent.py @@ -14,23 +14,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_ParamComponent(SSTTestCase): @@ -41,7 +24,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 3eeec1d07..8659964a4 100644 --- a/tests/testsuite_default_PerfComponent.py +++ b/tests/testsuite_default_PerfComponent.py @@ -15,23 +15,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_PerfComponent(SSTTestCase): @@ -42,7 +25,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 123c0baac..23ca2f2d6 100644 --- a/tests/testsuite_default_RNGComponent.py +++ b/tests/testsuite_default_RNGComponent.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_RNGComponent(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 4f001f34b..2a1139487 100644 --- a/tests/testsuite_default_RealTime.py +++ b/tests/testsuite_default_RealTime.py @@ -18,21 +18,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() ################################################################################ # These tests test the RealTime features of SST including: @@ -51,7 +36,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 094386a9a..cfa2f1021 100644 --- a/tests/testsuite_default_Serialization.py +++ b/tests/testsuite_default_Serialization.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Serialization(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 a7a644632..313cd536f 100644 --- a/tests/testsuite_default_SharedObject.py +++ b/tests/testsuite_default_SharedObject.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_SharedObject(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 06ad41039..9cc4f9c36 100644 --- a/tests/testsuite_default_StatisticsComponent.py +++ b/tests/testsuite_default_StatisticsComponent.py @@ -18,25 +18,9 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() have_h5 = sst_core_config_include_file_get_value_int("HAVE_HDF5", default=0, disable_warning=True) == 1 -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_StatisticComponent(SSTTestCase): @@ -47,7 +31,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 53bd203ab..74c5fae6a 100644 --- a/tests/testsuite_default_SubComponent.py +++ b/tests/testsuite_default_SubComponent.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_SubComponent(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 776050e6f..2609ed500 100644 --- a/tests/testsuite_default_UnitAlgebra.py +++ b/tests/testsuite_default_UnitAlgebra.py @@ -14,23 +14,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_UnitAlgebra(SSTTestCase): @@ -41,7 +24,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 f1cf007e9..2c4e3a22e 100644 --- a/tests/testsuite_default_config_input_output.py +++ b/tests/testsuite_default_config_input_output.py @@ -17,25 +17,9 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() have_mpi = sst_core_config_include_file_get_value_int("SST_CONFIG_HAVE_MPI", default=0, disable_warning=True) == 1 -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Config_input_output(SSTTestCase): @@ -46,7 +30,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 cfa0e53c2..adcc1af35 100644 --- a/tests/testsuite_default_partitioner.py +++ b/tests/testsuite_default_partitioner.py @@ -17,23 +17,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_Partitioners(SSTTestCase): @@ -44,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 6df6319ca..666dae18f 100644 --- a/tests/testsuite_default_sstinfo.py +++ b/tests/testsuite_default_sstinfo.py @@ -14,25 +14,9 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() have_curses = sst_core_config_include_file_get_value_int("HAVE_CURSES", default=0, disable_warning=True) == 1 -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ class testcase_sstinfo(SSTTestCase): @@ -43,7 +27,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + 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 c4727b06d..36bf9b862 100644 --- a/tests/testsuite_testengine_testing.py +++ b/tests/testsuite_testengine_testing.py @@ -14,23 +14,6 @@ from sst_unittest import * from sst_unittest_support import * -################################################################################ -# Code to support a single instance module initialize, must be called setUp method - -module_init = 0 -module_sema = threading.Semaphore() - -def initializeTestModule_SingleInstance(class_inst): - global module_init - global module_sema - - module_sema.acquire() - if module_init != 1: - # Put your single instance Init Code Here - module_init = 1 - module_sema.release() - -################################################################################ #################################################################### # These tests verify general operation of the SST Testing Frameworks @@ -45,7 +28,7 @@ def initializeClass(self, testName): def setUp(self): super(type(self), self).setUp() - initializeTestModule_SingleInstance(self) + type(self).initializeTestModule_SingleInstance() # Put test based setup code here. it is called once before every test def tearDown(self):