From: Noel Power Date: Mon, 16 Dec 2019 16:26:04 +0000 (+0000) Subject: s3/selftest: Move samba3.smbtorture_s3.hidenewfiles to fileserver_smb1 X-Git-Tag: ldb-2.2.0~1025 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07ccb8c70bb5490f953ab6cf2f088141a26e54b3;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.smbtorture_s3.hidenewfiles to fileserver_smb1 Test samba3.smbtorture_s3.hidenewfiles fails when run against test environments that don't support SMB1. Move this test to fileserver_smb1 and remove entry from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 168adc76b64..12d12e4fdae 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,7 +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.hidenewfiles\(simpleserver\)\(simpleserver\) ^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 6d052230b46..206eb775448 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -154,8 +154,8 @@ 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"]) -plantestsuite("samba3.smbtorture_s3.hidenewfiles(simpleserver)", - "simpleserver", +plantestsuite("samba3.smbtorture_s3.hidenewfiles(fileserver_smb1)", + "fileserver_smb1", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), 'hide-new-files-timeout',