s3/selftest: move base.delaywerite, base.deny1 & base.deny2 to _smb1 env

the following tests

samba3.base.delaywrite
samba3.base.deny1
samba3.base.deny2

have been moved to fileserver_smb1 env and removed from skip_file

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 c448eaa71efc587e31cc24a2c267ce6297aea891..dbc16e7da2aef9dc484d948697a9d09c9282cae1 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -13,11 +13,8 @@
 ^samba3.base.createx_access\(ad_dc\)
 ^samba3.base.defer_open\(ad_dc\)
 ^samba3.base.defer_open\(nt4_dc\)
-^samba3.base.delaywrite\(fileserver\)
 ^samba3.base.delete\(ad_dc\)
 ^samba3.base.delete\(nt4_dc\)
-^samba3.base.deny1\(fileserver\)
-^samba3.base.deny2\(fileserver\)
 ^samba3.base.deny3\(ad_dc\)
 ^samba3.base.deny3\(nt4_dc\)
 ^samba3.base.denydos\(ad_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 1eb36c6b4f6655b29b3617033a515a6c89d41d72..547d0922a605acedfbea80eff07b3ebe1dda0439 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -558,7 +558,7 @@ tests = base + raw + smb2 + rpc + unix + local + rap + nbt + idmap + vfs
 
 for t in tests:
     if t == "base.delaywrite" or t == "base.deny1" or t == "base.deny2":
-        plansmbtorture4testsuite(t, "fileserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
+        plansmbtorture4testsuite(t, "fileserver_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD --maximum-runtime=900')
     elif t == "base.createx_access":
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900')
     elif t == "rap.sam":