s3/selftest Move samba3.smbtorture_s3.plain.MANGLE-ILLEGAL to ad_dc_smb1

Also remove the 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 4b4aea98dc0b6715d01d6869e78e19bdd124480f..f9e7d7c233b62945322d99d05dd609bf0de0a731 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -23,7 +23,6 @@
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(simpleserver\)
 ^samba3.smbtorture_s3.hidenewfiles\(simpleserver\)\(simpleserver\)
-^samba3.smbtorture_s3.plain.MANGLE-ILLEGAL\(nt4_dc\)
 ^samba3.smbtorture_s3.plain.RENAME-ACCESS\(nt4_dc\)
 ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW1\(simpleserver\)
 ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW2\(simpleserver\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4cf4b85840f531b6053406125ab7ca0ff7cb0cae..6ee5a7cec176f7a4d4b8728c2e4a41f7ab21ccbe 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -144,7 +144,7 @@ tests = ["OPLOCK-CANCEL"]
 for t in tests:
     plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
 
-env = "nt4_dc"
+env = "nt4_dc_smb1"
 tests = ["MANGLE-ILLEGAL"]
 for t in tests:
     plantestsuite("samba3.smbtorture_s3.plain.%s" % t, env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/mangle_illegal', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])