s4:tests: Move duplicated test cases into loop

This is more consistent with how we run tests elsewhere.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0ec2fcbc617e6ad41b09c1283544d53b20794abb..2613a2367d8a0201a3061e0515a6d578400722b1 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -727,22 +727,14 @@ if have_heimdal_support:
 
     # these tests use a NCA local RPC connection, so always run on the
     # :local testenv, and so don't need to fake a client connection
-    planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_ncalrpc", extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_ncalrpc", extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_samlogon",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_samlogon",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log_netlogon",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth_log_netlogon",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc:local",
-                           "samba.tests.auth_log_netlogon_bad_creds",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-    planoldpythontestsuite("ad_dc_ntvfs:local",
-                           "samba.tests.auth_log_netlogon_bad_creds",
-                           extra_args=['-U"$USERNAME%$PASSWORD"'])
+    for env in ["ad_dc_ntvfs:local", "ad_dc:local"]:
+        planoldpythontestsuite(env, "samba.tests.auth_log_ncalrpc", extra_args=['-U"$USERNAME%$PASSWORD"'])
+        planoldpythontestsuite(env, "samba.tests.auth_log_samlogon",
+                               extra_args=['-U"$USERNAME%$PASSWORD"'])
+        planoldpythontestsuite(env, "samba.tests.auth_log_netlogon",
+                               extra_args=['-U"$USERNAME%$PASSWORD"'])
+        planoldpythontestsuite(env, "samba.tests.auth_log_netlogon_bad_creds",
+                               extra_args=['-U"$USERNAME%$PASSWORD"'])
 
     planoldpythontestsuite("ad_member:local",
                            "samba.tests.auth_log_winbind",