remove initializeTestModule_SingleInstance() ...

from subclasses.  The implementations are basically identical.

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)
 

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

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

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

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

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

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

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

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

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

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