s3/sefltest: Move samba3.rap.sam to ad_dc_smb1 environment

Test samba3.rap.sam fails in environments that don't support
SMB1 so we move it to enironment ad_dc_smb1 and remove the entry in
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 ab4d1688f868cf421b21c257e9c95a0a8fb8930b..224253594cde6fd05bb5e994fade83c507c1ba3c 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -31,7 +31,6 @@
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\)
-^samba3.rap.sam\(ad_dc\)
 ^samba3.rap.sam\(nt4_dc\)
 ^samba3.raw.acls\(ad_dc\)
 ^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 7128201229070837157aa77c6f9dc5f7ad36780c..042463b2ea29dc43c7d837d9a4847b5efe5e8dc6 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -563,7 +563,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
     elif t == "rap.sam":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')
     elif t == "winbind.pac":
         plansmbtorture4testsuite(t, "ad_member:local", '//$SERVER/tmp --realm=$REALM --machine-pass --option=torture:addc=$DC_SERVER', description="machine account")
     elif t == "unix.whoami":