From 89476feec1ccb59c0dd61019afaf23ed0a9affb1 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 16 Dec 2019 16:51:22 +0000 Subject: [PATCH] s3/selftest: Move samba3.smbtorture_s3.vfs_aio* to fileserver_smb1 move all failing tests to fileserver_smb1 (exception is the SMB2-BASIC test) doesn't need to move Additionally remove the associated entries from skip_smb1_file Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 6 ------ source3/selftest/tests.py | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 12d12e4fdae..14e94850efa 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,12 +19,6 @@ ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\) -^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\) -^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW1\(simpleserver\) -^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW2\(simpleserver\) -^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW3\(simpleserver\) ^samba3.unix.whoami\(ad_member\) ^samba3.unix.whoami anonymous connection\(ad_member\) ^samba3.unix.whoami anonymous connection\(nt4_member\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 206eb775448..3609defc8c9 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -151,8 +151,13 @@ for t in tests: tests = ["RW1", "RW2", "RW3", "SMB2-BASIC"] for t in tests: - plantestsuite("samba3.smbtorture_s3.vfs_aio_pthread(simpleserver).%s" % t, "simpleserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_pthread', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) - plantestsuite("samba3.smbtorture_s3.vfs_aio_fork(simpleserver).%s" % t, "simpleserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_fork', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + if t == "SMB2-BASIC": + env = "simpleserver" + else: + env = "fileserver_smb1" + + plantestsuite("samba3.smbtorture_s3.vfs_aio_pthread(%s).%s" % (env, t), env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_pthread', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) + plantestsuite("samba3.smbtorture_s3.vfs_aio_fork(%s).%s" % (env, t), env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_fork', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"]) plantestsuite("samba3.smbtorture_s3.hidenewfiles(fileserver_smb1)", "fileserver_smb1", -- 2.47.3