s4:selftest: make use of ad_dc_slowtests

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/skip b/selftest/skip
index b88412c082d9215f5668b46d3d2fdfce1720a9fe..a90998eac2230ce24a7ac81a27913eaafe863958 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -83,6 +83,7 @@
 ^samba4.raw.ping.pong          # Needs second server to test
 ^samba4.rpc.samr.accessmask
 ^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_ntvfs\) # currently fails, possibly config issue
+^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_slowtests\) # currently fails, possibly config issue
 ^samba4.rpc.samr.passwords.*s4member       # currently fails, possibly config issue
 ^samba4.raw.scan.eamax
 ^samba4.smb2.notify

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 6bf4b9491fbc235daed7d6cc0978df0191b61bd7..5fa32818063030ea553badf698f3d029a8204036 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -213,7 +213,7 @@ t = "rpc.countcalls"
 plansmbtorture4testsuite(t, "ad_dc_ntvfs:local", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.%s" % t)
 
 for transport in ["ncacn_np", "ncacn_ip_tcp"]:
-    env = "ad_dc_ntvfs"
+    env = "ad_dc_slowtests"
     if transport == "ncacn_np":
         tests = slow_ncacn_np_tests
     elif transport == "ncacn_ip_tcp":
@@ -840,19 +840,19 @@ for env in ["ad_dc_ntvfs", "vampire_dc", "promoted_dc"]:
     planoldpythontestsuite(env,
                            "samba.tests.py_credentials",
                            extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("ad_dc_ntvfs",
+planoldpythontestsuite("ad_dc_slowtests",
                        "samba.tests.emulate.traffic",
                        extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("ad_dc_ntvfs",
+planoldpythontestsuite("ad_dc_slowtests",
                        "samba.tests.emulate.traffic_packet",
                        extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("ad_dc_ntvfs",
+planoldpythontestsuite("ad_dc_slowtests",
                        "samba.tests.blackbox.traffic_replay",
                        extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("ad_dc_ntvfs",
+planoldpythontestsuite("ad_dc_slowtests",
                        "samba.tests.blackbox.traffic_learner",
                        extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("ad_dc_ntvfs",
+planoldpythontestsuite("ad_dc_slowtests",
                        "samba.tests.blackbox.traffic_summary",
                        extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
 planoldpythontestsuite("none", "samba.tests.loadparm")
@@ -941,7 +941,7 @@ for env in all_fl_envs:
         # therefore skip it in that configuration
         plantestsuite_loadlist("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", '$LOADLIST', '$LISTOPT'])
 
-for env in ["ad_dc_ntvfs"]:
+for env in ["ad_dc_slowtests"]:
     # This test takes a lot of time, so we run it against a minimum of
     # environments, please only add new ones if there's really a
     # difference we need to test