Merge pull request #2385 from sstsimulator/devel

Automatically Merged using SST Master Branch Merger
sstsimulator · Aug 8, 2024 · 076ffea · 076ffea
2 parents fddcfdc + 260c47d
commit 076ffea
Show file tree

Hide file tree

Showing 38 changed files with 29 additions and 797 deletions.
diff --git a/src/sst/elements/ariel/tests/testsuite_default_Ariel.py b/src/sst/elements/ariel/tests/testsuite_default_Ariel.py
@@ -4,36 +4,13 @@
 from sst_unittest_support import *
 import os
 
-################################################################################
-# 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:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setup_ariel_test_files()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
-################################################################################
-################################################################################
 
 class testcase_Ariel(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
         # Put test based setup code here. it is called once before every test
+        self._setup_ariel_test_files()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py b/src/sst/elements/ariel/tests/testsuite_testio_Ariel.py
@@ -5,37 +5,13 @@
 import os
 import inspect
 
-################################################################################
-# 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:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setup_ariel_test_files()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
-################################################################################
-################################################################################
-
 
 class testcase_Ariel(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
         # Put test based setup code here. it is called once before every test
+        self._setup_ariel_test_files()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/balar/tests/testsuite_default_balar.py b/src/sst/elements/balar/tests/testsuite_default_balar.py
@@ -6,31 +6,12 @@
 import os
 import shutil
 
-################################################################################
-# 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
-        class_inst._setupbalarTestFiles()
-        module_init = 1
-
-    module_sema.release()
-
-################################################################################
 
 class testcase_balar(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._setupbalarTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py b/src/sst/elements/cacheTracer/tests/testsuite_default_cacheTracer.py
@@ -3,33 +3,11 @@
 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:
-        try:
-            # Put your single instance Init Code Here
-            pass
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_cacheTracer_Component(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
         # Put test based setup code here. it is called once before every test
 
     def tearDown(self):

diff --git a/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py b/src/sst/elements/cassini/tests/testsuite_default_cassini_prefetch.py
@@ -3,33 +3,11 @@
 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:
-        try:
-            # Put your single instance Init Code Here
-            pass
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_cassini_prefetch(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
         # Put test based setup code here. it is called once before every test
 
     def tearDown(self):

diff --git a/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py b/src/sst/elements/cramSim/tests/testsuite_default_cramSim.py
@@ -6,35 +6,12 @@
 import os
 import shutil
 
-################################################################################
-# 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:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setupcramSimTestFiles()
-            module_init = 1
-        except:
-            pass
-        module_init = 1
-
-    module_sema.release()
-
-################################################################################
 
 class testcase_cramSim_Component(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._setupcramSimTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py b/src/sst/elements/ember/tests/testsuite_default_ember_ESshmem.py
@@ -74,30 +74,12 @@ def gen_custom_name(testcase_func, param_num, param):
         parameterized.to_safe_name(str(param.args[1])))
     return testcasename
 
-################################################################################
-# Code to support a single instance module initialize, must be called setUp method
-
-def initializeTestModule_SingleInstance(class_inst):
-    global module_init
-    global module_sema
-
-    module_sema.acquire()
-    if module_init != 1:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setupESshmemTestFiles()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_Ember_ESshmem(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._setupESshmemTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py b/src/sst/elements/ember/tests/testsuite_default_ember_nightly.py
@@ -5,34 +5,13 @@
 
 import os
 
-################################################################################
-# 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:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._cleanupEmberTestFiles()
-            class_inst._setupEmberTestFiles()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_EmberNightly(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._cleanupEmberTestFiles()
+        self._setupEmberTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_qos.py b/src/sst/elements/ember/tests/testsuite_default_ember_qos.py
@@ -5,33 +5,12 @@
 
 import os
 
-################################################################################
-# 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:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setupQOSTestFiles()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_QOS(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._setupQOSTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py b/src/sst/elements/ember/tests/testsuite_default_ember_sweep.py
@@ -135,30 +135,12 @@ def gen_custom_name(testcase_func, param_num, param):
         parameterized.to_safe_name(str(param.args[1])))
     return testcasename
 
-################################################################################
-# Code to support a single instance module initialize, must be called setUp method
-
-def initializeTestModule_SingleInstance(class_inst):
-    global module_init
-    global module_sema
-
-    module_sema.acquire()
-    if module_init != 1:
-        try:
-            # Put your single instance Init Code Here
-            class_inst._setupEmberTestFiles()
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_EmberSweep(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
+        self._setupEmberTestFiles()
 
     def tearDown(self):
         # Put test based teardown code here. it is called once after every test

diff --git a/src/sst/elements/gensa/tests/testsuite_default_gensa.py b/src/sst/elements/gensa/tests/testsuite_default_gensa.py
@@ -3,33 +3,11 @@
 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:
-        try:
-            # Put your single instance Init Code Here
-            pass
-        except:
-            pass
-        module_init = 1
-    module_sema.release()
-
-################################################################################
 
 class testcase_gensa_Component(SSTTestCase):
 
     def setUp(self):
         super(type(self), self).setUp()
-        initializeTestModule_SingleInstance(self)
         # Put test based setup code here. it is called once before every test
 
     def tearDown(self):