s4:dsdb:tests: Use loadTestsFromTestCase() instead of makeSuite()

makeSuite() is deprecated and will be removed in Python 3.13.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py
index 0a5641126befca9d7217a1740b4a8d0901c34548..39f9e67cd26ce392a963039ad9cfac7b70f0de8f 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_medley_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py
@@ -515,7 +515,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/ad_dc_multi_bind.py b/source4/dsdb/tests/python/ad_dc_multi_bind.py
index 62ae9bcf47c565fed02bf860fda4ed15a2bba119..93a1c30956a7f68a696398c54ccf831e44b51284 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_multi_bind.py
+++ b/source4/dsdb/tests/python/ad_dc_multi_bind.py
@@ -80,7 +80,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/ad_dc_performance.py b/source4/dsdb/tests/python/ad_dc_performance.py
index 0f69d8e8efe78ee2c9144221446c1b4c1be376d5..b8863b51b020fe0d881fc36d146bb4fde4496e9b 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_performance.py
@@ -332,7 +332,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/ad_dc_provision_performance.py b/source4/dsdb/tests/python/ad_dc_provision_performance.py
index 3531ced38a0a32ede20a3864a18749daaaad3997..bfe922698ba108e41a155834f3de722baf313871 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_provision_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_provision_performance.py
@@ -123,7 +123,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py
index ef0e89eed86ced81d07d1aa35e14f84bb41284c7..aabcc22c50ee07fd0e64a6bbb485989859f9b689 100644 (file)
--- a/source4/dsdb/tests/python/ad_dc_search_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_search_performance.py
@@ -288,7 +288,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py
index a608d1af1b8d9f1079a683d001ec8d06b4a87bea..5defacf19ec94290079086366d9c3b10edb831af 100644 (file)
--- a/source4/dsdb/tests/python/ndr_pack_performance.py
+++ b/source4/dsdb/tests/python/ndr_pack_performance.py
@@ -214,7 +214,8 @@ if "://" not in host:
 
 if ANCIENT_SAMBA:
     runner = SubunitTestRunner()
-    if not runner.run(unittest.makeSuite(UserTests)).wasSuccessful():
+    if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+            UserTests)).wasSuccessful():
         sys.exit(1)
     sys.exit(0)
 else:

diff --git a/source4/dsdb/tests/python/priv_attrs.py b/source4/dsdb/tests/python/priv_attrs.py
index 330d4589a9bf9b7e86d8aa406b9ad5c9e60297a8..5c9db730f619e1ff09c80547f44160499f986895 100644 (file)
--- a/source4/dsdb/tests/python/priv_attrs.py
+++ b/source4/dsdb/tests/python/priv_attrs.py
@@ -386,6 +386,7 @@ class PrivAttrsTests(samba.tests.TestCase):
 
 runner = SubunitTestRunner()
 rc = 0
-if not runner.run(unittest.makeSuite(PrivAttrsTests)).wasSuccessful():
+if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+        PrivAttrsTests)).wasSuccessful():
     rc = 1
 sys.exit(rc)

diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index af5b0e9ea99e01b18ae810f4e32f15d9df5be2b4..edc0fa0dda3430884bfc414a4f017830451f2c2a 100755 (executable)
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -1292,6 +1292,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
 runner = SubunitTestRunner()
 rc = 0
-if not runner.run(unittest.makeSuite(UserAccountControlTests)).wasSuccessful():
+if not runner.run(unittest.TestLoader().loadTestsFromTestCase(
+        UserAccountControlTests)).wasSuccessful():
     rc = 1
 sys.exit(rc)