Fix setUp vs setupClass in graalpytest

Author: otethal

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -380,9 +380,16 @@ def run_test(self, func):
             pass
         else:
             def do_run():
+                if hasattr(self, "setUp"):
+                    if not self.run_safely(self.setUp, print_immediately=True):
+                        self.failure(0)
+                        return
                 start = time.monotonic()
                 r = self.run_safely(func)
                 end = time.monotonic() - start
+                if hasattr(self, "tearDown"):
+                    if not self.run_safely(self.tearDown):
+                        self.failure(end)
                 with print_lock:
                     if r is _skipped_marker:
                         self.skipped()
@@ -528,17 +535,17 @@ def run(cls, items=None):
                 if typ is TestCase:
                     break
                 items += typ.__dict__.items()
-        if hasattr(instance, "setUp"):
-            if not instance.run_safely(instance.setUp, print_immediately=True):
+        if hasattr(instance, "setUpClass"):
+            if not instance.run_safely(instance.setUpClass, print_immediately=True):
                 return instance
         for k, v in items:
             if k.startswith("test"):
                 if patterns:
                     if not any(p in k for p in patterns):
                         continue
                 instance.run_test(getattr(instance, k, v))
-        if hasattr(instance, "tearDown"):
-            instance.run_safely(instance.tearDown)
+        if hasattr(instance, "tearDownClass"):
+            instance.run_safely(instance.tearDownClass)
         return instance
 
     @staticmethod

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -62,7 +62,7 @@ def unhandled_error_compare_with_message(x, y):
 
 class CPyExtTestCase():
 
-    def setUp(self):
+    def setUpClass(self):
         for typ in type(self).mro():
             for k, v in typ.__dict__.items():
                 if k.startswith("test_"):

graalpython/com.oracle.graal.python.test/src/tests/test__class__.py

@@ -48,7 +48,7 @@ def find_code_object(t):
 
 class BasicTests(unittest.TestCase):
 
-    def tearDown(self):
+    def tearDownClass(self):
         nonlocal __class__
         __class__ = BasicTests
 

graalpython/com.oracle.graal.python.test/src/tests/test_mmap.py

@@ -19,11 +19,11 @@
 
 class MmapTests(unittest.TestCase):
 
-    def setUp(self):
+    def setUpClass(self):
         if os.path.exists(TESTFN):
             os.unlink(TESTFN)
 
-    def tearDown(self):
+    def tearDownClass(self):
         try:
             os.unlink(TESTFN)
         except OSError:

graalpython/com.oracle.graal.python.test/src/tests/test_subprocess.py

@@ -13,7 +13,7 @@ def test_os_pipe():
 
 
 class TestSubprocess(unittest.TestCase):
-    def setUp(self):
+    def setUpClass(self):
         global subprocess, io, sys
         import subprocess, io, sys
 

graalpython/com.oracle.graal.python.test/src/tests/test_thread.py

@@ -74,7 +74,7 @@ def verbose_print(arg):
 
     class BasicThreadTest(unittest.TestCase):
 
-        def setUp(self):
+        def setUpClass(self):
             self.done_mutex = thread.allocate_lock()
             self.done_mutex.acquire()
             self.running_mutex = thread.allocate_lock()
@@ -85,7 +85,7 @@ def setUp(self):
 
             self._threads = support.threading_setup()
 
-        def tearDown(self):
+        def tearDownClass(self):
             support.threading_cleanup(*self._threads)
 
 
@@ -296,10 +296,10 @@ def do_finish(self):
     class BaseTestCase(unittest.TestCase):
         failureException = AssertionError
 
-        def setUp(self):
+        def setUpClass(self):
             self._threads = support.threading_setup()
 
-        def tearDown(self):
+        def tearDownClass(self):
             support.threading_cleanup(*self._threads)
             # TODO: revert patch when os.waitpid(-1, ...) is implemented
             # support.reap_children()

graalpython/com.oracle.graal.python.test/src/tests/test_venv.py

@@ -46,11 +46,11 @@
 
 
 class VenvTest():
-    def setUp(self):
+    def setUpClass(self):
         self.env_dir = os.path.realpath(tempfile.mkdtemp())
         self.env_dir2 = os.path.realpath(tempfile.mkdtemp())
 
-    def tearDown(self):
+    def tearDownClass(self):
         shutil.rmtree(self.env_dir)
         shutil.rmtree(self.env_dir2)
 

graalpython/com.oracle.graal.python.test/src/tests/test_zipimport.py

@@ -35,15 +35,15 @@ def get_file():
 
 class ZipImportBaseTestCase(unittest.TestCase):
 
-    def setUp(self):
+    def setUpClass(self):
         zipimport._zip_directory_cache.clear()
         self.path = sys.path[:]
         self.meta_path = sys.meta_path[:]
         self.path_hooks = sys.path_hooks[:]
         sys.path_importer_cache.clear()
         self.modules_before = support.modules_setup()
 
-    def tearDown(self):
+    def tearDownClass(self):
         sys.path[:] = self.path
         sys.meta_path[:] = self.meta_path
         sys.path_hooks[:] = self.path_hooks
@@ -52,8 +52,8 @@ def tearDown(self):
 
 class BasicZipImportTests(ZipImportBaseTestCase):
 
-    def setUp(self):
-        ZipImportBaseTestCase.setUp(self)
+    def setUpClass(self):
+        ZipImportBaseTestCase.setUpClass(self)
         self.z = zipimport.zipimporter(ZIP_PATH)
 
     def test_zipimporter_attribute(self):
@@ -147,11 +147,11 @@ def test_zipimporter_load_module(self):
 
 class ZipImportWithPrefixTests(ZipImportBaseTestCase):
 
-    def setUp(self):
-        ZipImportBaseTestCase.setUp(self)
+    def setUpClass(self):
+        ZipImportBaseTestCase.setUpClass(self)
         self.z = zipimport.zipimporter(ZIP_PATH + "/cesta")
 
-    def tearDown(self):
+    def tearDownClass(self):
         zipimport._zip_directory_cache.clear()
 
     def test_zipimporter_with_prefix_attribute(self):
@@ -172,8 +172,8 @@ def test_zipimporter_with_prefix_find_module(self):
 
 class ImportTests(ZipImportBaseTestCase):
 
-    def setUp(self):
-        ZipImportBaseTestCase.setUp(self)
+    def setUpClass(self):
+        ZipImportBaseTestCase.setUpClass(self)
         sys.path.insert(0, ZIP_PATH)
 
     def test_module_import(self):
@@ -184,8 +184,8 @@ def test_module_import(self):
 
 class BasicEggImportTests(ZipImportBaseTestCase):
 
-    def setUp(self):
-        ZipImportBaseTestCase.setUp(self)
+    def setUpClass(self):
+        ZipImportBaseTestCase.setUpClass(self)
         self.z = zipimport.zipimporter(EGG_PATH)
 
     def test_zipimporter_egg(self):
@@ -208,8 +208,8 @@ def test_egg_get_readme(self):
 class GR15813ImportTests(ZipImportBaseTestCase):
 
     # don't edit the zip file !!!
-    def setUp(self):
-        ZipImportBaseTestCase.setUp(self)
+    def setUpClass(self):
+        ZipImportBaseTestCase.setUpClass(self)
         self.z = zipimport.zipimporter(GR15813_PATH)
 
     def test_zipimporter_gr_18813(self):