From: Noel Power Date: Fri, 13 Dec 2019 12:18:03 +0000 (+0000) Subject: s3/selftest: Move samba3.raw.notify & samba3.raw.oplock to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1046 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4bdeabf1d464accba105296dc08e35b79de2b87;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.raw.notify & samba3.raw.oplock to nt4_dc_smb1 Move samba3.raw.notify & samba3.raw.oplock which fail when used with test environments that don't support SMB1 to nt4_dc_smb1 and remove associated 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 dfa4cb35914..1b2c92314a9 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.notify\(nt4_dc\) -^samba3.raw.oplock\(nt4_dc\) ^samba3.raw.read aio\(nt4_dc\) ^samba3.raw.read\(nt4_dc\) ^samba3.raw.samba3checkfsp\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 36073724868..4aa28ba0a6b 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -711,6 +711,8 @@ for t in tests: plansmbtorture4testsuite(t, "simpleserver", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "smb2.notify" or t == "raw.notify" or t == "smb2.oplock" or t == "raw.oplock": tmp_env = "nt4_dc" + if t == "raw.notify" or t == "raw.oplock": + tmp_env = "nt4_dc_smb1" # These tests are a little slower so don't duplicate them with ad_dc plansmbtorture4testsuite(t, tmp_env, '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --signing=required') elif t == "smb2.dosmode":