From 65aa21b8e7de636347bf645eb581b779c9add76f Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 18:27:25 +0000 Subject: [PATCH] s3/selftest Move samba3.smbtorture_s3.plain.RENAME-ACCESS to nt4_dc_smb1 Also remove associated entry from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 1 - source3/selftest/tests.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index f491e7899c5..4e0cc7c1d0d 100644 --- 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.RENAME-ACCESS\(nt4_dc\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW1\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW2\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW3\(simpleserver\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index c27ef13f53e..23bd61f8a8a 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -136,7 +136,7 @@ plantestsuite("samba3.smbtorture_s3.plain.%s" % t, # # RENAME-ACCESS needs to run against a special share - acl_xattr_ign_sysacl_windows # -plantestsuite("samba3.smbtorture_s3.plain.%s" % "RENAME-ACCESS", "nt4_dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) +plantestsuite("samba3.smbtorture_s3.plain.%s" % "RENAME-ACCESS", "nt4_dc_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) plantestsuite("samba3.smbtorture_s3.crypt_client.%s" % "RENAME-ACCESS", "nt4_dc_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), "RENAME-ACCESS", '//$SERVER_IP/acl_xattr_ign_sysacl_windows', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"]) # non-crypt only -- 2.47.3