s3/selftest: Move samba3.raw.lock & samba3.base.lock to nt4_dc_smb1

samba3.raw.lock & samba3.raw.lock currently will only work in
environments that negotiate SMB1 so lets move them to new nt4_dc_smb1
and remove those entries form 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 cce229e726565fc30276d16ac65fb19f0df724c6..dfd5500b57d6c39054fd1340110417dbbfa7a2b5 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -6,7 +6,6 @@
 # a) remove the failing test
 # b) port the failing test to SMB2
 # c) fix the test
-^samba3.base.lock\(nt4_dc\)
 ^samba3.base.rw1\(nt4_dc\)
 ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1\(ad_member\)
 ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1.member_creds\(ad_member\)
@@ -39,7 +38,6 @@
 ^samba3.raw.acls nfs4acl_xattr-xdr-41\(nt4_dc\)
 ^samba3.raw.acls\(nt4_dc\)
 ^samba3.raw.chkpath\(nt4_dc\)
-^samba3.raw.lock\(nt4_dc\)
 ^samba3.raw.notify\(nt4_dc\)
 ^samba3.raw.oplock\(nt4_dc\)
 ^samba3.raw.read aio\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 41fe12c8a056939c8e15399faff2da4441083d7b..e1be5a6ba7b7d0ab14a0e98369960ffb18bd0849 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -661,7 +661,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
     elif t == "raw.lock" or t == "base.lock":
-        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
     elif t == "raw.read":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')