s3/selftest: Move various samba3.base.* tests to _smb1 environment(s)

From list of tests identified as failing with environments that
cannot negotiate SMB2 the following tests have been moved to ad_dc_smb1
& nt4_dc_smb1 (and additionally removed from skip_smb1_fails)

samba3.base.attr
samba3.base.chkpath
samba3.base.defer_open
samba3.base.delete
samba3.base.deny3
samba3.base.denydos
samba3.base.dir1
samba3.base.dir2
samba3.base.disconnect
samba3.base.fdpass
samba3.base.mangle
samba3.base.negnowait
samba3.base.ntdeny1
samba3.base.ntdeny2
samba3.base.open
samba3.base.openattr
samba3.base.properties
samba3.base.rename
samba3.base.samba3error
samba3.base.secleak
samba3.base.tcon
samba3.base.tcondev
samba3.base.trans2
samba3.base.unlink
samba3.base.vuid
samba3.base.xcopy

list of tests verified with

python3 source3/selftest/tests.py  | egrep 'ad_dc_smb1|nt4_dc_smb1' | grep "^samba3.base" | sort -u

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 dbc16e7da2aef9dc484d948697a9d09c9282cae1..afb9eb0eca04b62fd5e7fdb95bbe2ddee9a71ca5 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -6,62 +6,10 @@
 # a) remove the failing test
 # b) port the failing test to SMB2
 # c) fix the test
-^samba3.base.attr\(ad_dc\)
-^samba3.base.attr\(nt4_dc\)
-^samba3.base.chkpath\(ad_dc\)
-^samba3.base.chkpath\(nt4_dc\)
 ^samba3.base.createx_access\(ad_dc\)
-^samba3.base.defer_open\(ad_dc\)
-^samba3.base.defer_open\(nt4_dc\)
-^samba3.base.delete\(ad_dc\)
-^samba3.base.delete\(nt4_dc\)
-^samba3.base.deny3\(ad_dc\)
-^samba3.base.deny3\(nt4_dc\)
-^samba3.base.denydos\(ad_dc\)
-^samba3.base.denydos\(nt4_dc\)
-^samba3.base.dir1\(ad_dc\)
-^samba3.base.dir1\(nt4_dc\)
-^samba3.base.dir2\(ad_dc\)
-^samba3.base.dir2\(nt4_dc\)
-^samba3.base.disconnect\(ad_dc\)
-^samba3.base.disconnect\(nt4_dc\)
-^samba3.base.fdpass\(ad_dc\)
-^samba3.base.fdpass\(nt4_dc\)
 ^samba3.base.lock\(nt4_dc\)
-^samba3.base.mangle\(ad_dc\)
-^samba3.base.mangle\(nt4_dc\)
-^samba3.base.negnowait\(ad_dc\)
-^samba3.base.negnowait\(nt4_dc\)
-^samba3.base.ntdeny1\(ad_dc\)
-^samba3.base.ntdeny1\(nt4_dc\)
-^samba3.base.ntdeny2\(ad_dc\)
-^samba3.base.ntdeny2\(nt4_dc\)
-^samba3.base.open\(ad_dc\)
-^samba3.base.openattr\(ad_dc\)
-^samba3.base.openattr\(nt4_dc\)
-^samba3.base.open\(nt4_dc\)
-^samba3.base.properties\(ad_dc\)
-^samba3.base.properties\(nt4_dc\)
-^samba3.base.rename\(ad_dc\)
-^samba3.base.rename\(nt4_dc\)
 ^samba3.base.rw1\(ad_dc\)
 ^samba3.base.rw1\(nt4_dc\)
-^samba3.base.samba3error\(ad_dc\)
-^samba3.base.samba3error\(nt4_dc\)
-^samba3.base.secleak\(ad_dc\)
-^samba3.base.secleak\(nt4_dc\)
-^samba3.base.tcon\(ad_dc\)
-^samba3.base.tcondev\(ad_dc\)
-^samba3.base.tcondev\(nt4_dc\)
-^samba3.base.tcon\(nt4_dc\)
-^samba3.base.trans2\(ad_dc\)
-^samba3.base.trans2\(nt4_dc\)
-^samba3.base.unlink\(ad_dc\)
-^samba3.base.unlink\(nt4_dc\)
-^samba3.base.vuid\(ad_dc\)
-^samba3.base.vuid\(nt4_dc\)
-^samba3.base.xcopy\(ad_dc\)
-^samba3.base.xcopy\(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\)
 ^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 547d0922a605acedfbea80eff07b3ebe1dda0439..05279cdca7636b5cb8b7ef3edfcb677597b15ea8 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -750,6 +750,9 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
     elif t == "rpc.spoolss.notify":
         plansmbtorture4testsuite(t, "ad_member", '//$SERVER_IP/tmp -U$DC_USERNAME%$DC_PASSWORD')
+    elif (t in base and t != "base.charset"):
+        plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     else:
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')