Convert from unittest.makeSuite to unittest.TestLoader().loadTestsFro…

…mTestCase. The former is a (for some reason) deprecated shortcut for the latter.
zodb · Oct 11, 2024 · d922ba3 · d922ba3
1 parent 058781a
commit d922ba3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
diff --git a/src/relstorage/adapters/tests/test_replica.py b/src/relstorage/adapters/tests/test_replica.py
@@ -129,7 +129,7 @@ def test_next_with_new_conf(self):
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ReplicaSelectorTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ReplicaSelectorTests))
     return suite
 
 if __name__ == '__main__':

diff --git a/src/relstorage/adapters/tests/test_util.py b/src/relstorage/adapters/tests/test_util.py
@@ -103,7 +103,7 @@ def thing(self, arg1, arg2=False):
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestNoOp))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestNoOp))
     return suite
 
 if __name__ == '__main__':

diff --git a/src/relstorage/cache/tests/test_cache_stats.py b/src/relstorage/cache/tests/test_cache_stats.py
@@ -162,7 +162,7 @@ class NoTest(unittest.TestCase):
             @unittest.skip("ZEO not installed")
             def test_cache_trace_analysis(self):
                 "Does nothing"
-        suite.addTest(unittest.makeSuite(NoTest))
+        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(NoTest))
     else:
         suite.addTest(
             doctest.DocFileSuite(

diff --git a/src/relstorage/tests/blob/testblob.py b/src/relstorage/tests/blob/testblob.py
@@ -597,7 +597,7 @@ def add_test_based_on_test_class(klass, **attr):
         )
         new_class.__module__ = klass.__module__
         new_class = unittest.skipUnless(storage_is_available, str(storage_is_available))(new_class)
-        suite.addTest(unittest.makeSuite(new_class))
+        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(new_class))
 
     add_test_based_on_test_class(TestBlobTransaction)
     add_test_based_on_test_class(TestBlobImportExport)

diff --git a/src/relstorage/tests/test_treemark.py b/src/relstorage/tests/test_treemark.py
@@ -87,7 +87,7 @@ def test_64bit_circular(self):
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestTreeMarker))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(TestTreeMarker))
     return suite
 
 if __name__ == '__main__':

diff --git a/src/relstorage/tests/test_zodbconvert.py b/src/relstorage/tests/test_zodbconvert.py
@@ -468,8 +468,8 @@ def deep_compare_current_states(self):
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(FSZODBConvertTests))
-    suite.addTest(unittest.makeSuite(ZlibWrappedFSZODBConvertTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FSZODBConvertTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ZlibWrappedFSZODBConvertTests))
     return suite
 
 if __name__ == '__main__':

diff --git a/src/relstorage/tests/test_zodbpack.py b/src/relstorage/tests/test_zodbpack.py
@@ -103,7 +103,7 @@ def test_pack_defaults(self):
 
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(ZODBPackScriptTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ZODBPackScriptTests))
     return suite
 
 if __name__ == '__main__':

diff --git a/src/relstorage/tests/util.py b/src/relstorage/tests/util.py
@@ -231,7 +231,7 @@ def test_suite(self):
         from .reltestbase import AbstractIDBOptionsTest
 
         suite = unittest.TestSuite()
-        suite.addTest(unittest.makeSuite(type(
+        suite.addTest(unittest.TestLoader().loadTestsFromTestCase(type(
             self.__name__ + 'DBOptionsTest',
             (AbstractIDBOptionsTest,),
             {'db_options': self.drivers}
@@ -245,7 +245,7 @@ def test_suite(self):
             )
             # Checking the driver is just a unit test, it doesn't connect or
             # need a layer
-            suite.addTest(unittest.makeSuite(
+            suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
                 self.__skipping_if_not_available(
                     type(
                         self.__name__ + 'DBDriverTest_' + available.escaped_driver_name,
@@ -403,19 +403,21 @@ def _add_driver_to_suite(self, suite, layer_prefix, driver_available):
         # pylint:disable=too-many-locals
         for klass in self._make_check_classes():
             klass = self._new_class_for_driver(klass, driver_available)
-            suite.addTest(unittest.makeSuite(klass, "check"))
+            loader = unittest.TestLoader()
+            loader.testMethodPrefix = 'check'
+            suite.addTest(loader.loadTestsFromTestCase(klass))
 
         for klass in self._make_test_classes():
             klass = self._new_class_for_driver(klass, driver_available)
-            suite.addTest(unittest.makeSuite(klass))
+            suite.addTest(unittest.TestLoader().loadTestsFromTestCase(klass))
 
         for klass in self._make_zodbconvert_classes():
-            suite.addTest(unittest.makeSuite(
+            suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
                 self._new_class_for_driver(klass,
                                            driver_available)))
 
         for klass in self.extra_test_classes:
-            suite.addTest(unittest.makeSuite(
+            suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
                 self._new_class_for_driver(klass,
                                            driver_available)))