From: Noel Power Date: Fri, 13 Dec 2019 12:19:38 +0000 (+0000) Subject: s3/selftest Move samba.raw.read to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1045 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d9506deae8a70db8551b66c311590383d676792;p=thirdparty%2Fsamba.git s3/selftest Move samba.raw.read to nt4_dc_smb1 Move test samba.raw.read which fails in test environments that don't support SMB1 to nt4_dc_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 1b2c92314a9..b0086975242 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,8 +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.raw.read aio\(nt4_dc\) -^samba3.raw.read\(nt4_dc\) ^samba3.raw.samba3checkfsp\(nt4_dc\) ^samba3.raw.samba3checkfsp\(simpleserver\) ^samba3.raw.samba3closeerr\(simpleserver\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 4aa28ba0a6b..e7771759098 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -669,8 +669,8 @@ for t in tests: elif t == "raw.lock" or t == "base.lock": plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') elif t == "raw.read": - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio') plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "raw.search": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')