s3/selftest: Move samba3.raw.notify & samba3.raw.oplock to nt4_dc_smb1

Move samba3.raw.notify & samba3.raw.oplock which fail when used with
test environments that don't support SMB1 to nt4_dc_smb1 and remove
associated 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 dfa4cb35914ca85a1e78b6500887609db7e842d6..1b2c92314a920926663e1bd6d1aee14161a3802b 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -19,8 +19,6 @@
 ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\)
 ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\)
-^samba3.raw.notify\(nt4_dc\)
-^samba3.raw.oplock\(nt4_dc\)
 ^samba3.raw.read aio\(nt4_dc\)
 ^samba3.raw.read\(nt4_dc\)
 ^samba3.raw.samba3checkfsp\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 36073724868bbe73633e9b01ec49cb8b2b018638..4aa28ba0a6b3ec32b933f5b629d531b1673d38af 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -711,6 +711,8 @@ for t in tests:
         plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "smb2.notify" or t == "raw.notify" or t == "smb2.oplock" or t == "raw.oplock":
         tmp_env = "nt4_dc"
+        if t == "raw.notify" or t == "raw.oplock":
+            tmp_env = "nt4_dc_smb1"
         # These tests are a little slower so don't duplicate them with ad_dc
         plansmbtorture4testsuite(t, tmp_env, '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --signing=required')
     elif t == "smb2.dosmode":