s3/selftest: Move samba3.base.createx_access to ad_dc_smb1 env

Test samba3.base.createx_access fails in environments that dont
support SMB1, moving this test to ad_dc_smb1 and removing the entry
in skip_smb1_fails

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 3ba0c2f908436c34aca04cc8d9a9bec304a30e30..ab4d1688f868cf421b21c257e9c95a0a8fb8930b 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.createx_access\(ad_dc\)
 ^samba3.base.lock\(nt4_dc\)
 ^samba3.base.rw1\(ad_dc\)
 ^samba3.base.rw1\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 016c4e405f5b8402994060af4f8759fef36652c1..7128201229070837157aa77c6f9dc5f7ad36780c 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -560,7 +560,7 @@ for t in tests:
     if t == "base.delaywrite" or t == "base.deny1" or t == "base.deny2":
         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')
+        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, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1')