s4/selftest: move samba4.dfs.domain to ad_dc_smb1

Additionally remove the test entry from skip_smb1_fails

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 504bf39637ab75a95c20455263405e3d1df94a77..fe6427715395918a263dd0408f94e6657da994ad 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -172,7 +172,6 @@
 ^samba4.blackbox.pkinit\(ad_dc:local\)
 ^samba4.blackbox.smbclient\(ad_member:local\)\(ad_member:local\)
 ^samba4.blackbox.smbclient\(chgdcpass:local\)\(chgdcpass:local\)
-^samba4.dfs.domain\(ad_dc\)
 ^samba4.ldap.nested-search\(ad_dc_default\)
 ^samba4.libsmbclient.list_shares.NT1\(nt4_dc\)
 ^samba4.libsmbclient.readdirplus.NT1\(nt4_dc\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 406702811827e4ac74e3a06661b10c9e4013bf4a..f3064c429d100ebd1a93075c121d73384c63e953 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -245,7 +245,7 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]:
 # Tests for the DFS referral calls implementation
 for t in smbtorture4_testsuites("dfs."):
     plansmbtorture4testsuite(t, "ad_dc_ntvfs", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
-    plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
+    plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
 
 # Tests for the NET API (net.api.become.dc tested below against all the roles)
 net_tests = list(filter(lambda x: "net.api.become.dc" not in x, smbtorture4_testsuites("net.")))