s3/selftest: Move samba3.rap.sam to nt4_dc_smb1

This tests fails against nt4_dc because it doesn't support SMB1 so
we move it to nt4_dc_smb1 and remove the corrosponding entry from
skip_smb1_fail

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 2684cfe05b3c77ba7856348e6a0ee3aba24e7b35..6d78f56518211497378dc1026f4a4afaa53294e9 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -21,7 +21,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\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-nfs-41\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-simple-40\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 23cebcb872d04a935a66fadcc396ddff06b81c27..3896fcbd9cd6721a6994b00b9347a8aaf533a5dc 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -570,7 +570,7 @@ for t in tests:
     elif t == "base.createx_access":
         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, "nt4_dc_smb1", '//$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")