From: Noel Power Date: Mon, 16 Dec 2019 12:54:11 +0000 (+0000) Subject: s3/selftest: Move samba3.raw.samba3posixtimedlock to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1041 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fa646177091de77313a43e4effdd8dba039652e;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.raw.samba3posixtimedlock to nt4_dc_smb1 Test samba3.raw.samba3posixtimedlock will not succeed in test environments that don't support SMB1 so we move it to nt4_dc_smb1 and remove associated entries from skip_smb1_selftest Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index ca8c1725d15..533f53070c2 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -22,9 +22,6 @@ ^samba3.raw.samba3checkfsp\(simpleserver\) ^samba3.raw.samba3closeerr\(simpleserver\) ^samba3.raw.samba3hide\(simpleserver\) -^samba3.raw.samba3posixtimedlock\(nt4_dc\) -^samba3.raw.samba3posixtimedlock brl_delay_inject1\(nt4_dc\) -^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\) ^samba3.raw.search\(nt4_dc\) ^samba3.raw.session plain\(nt4_dc\) ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,bigendian\] \(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index bf986b68f07..3133ea8575d 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -587,10 +587,10 @@ for t in tests: plansmbtorture4testsuite(t, env, '//$SERVER/tmpguest -U% --option=torture:addc=$DC_SERVER', description='anonymous connection') plansmbtorture4testsuite(t, env, '//$SERVER/tmp -k no -U$DC_USERNAME@$REALM%$DC_PASSWORD', description='ntlm user@realm') elif t == "raw.samba3posixtimedlock": - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject1 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share', + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc_smb1/share') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/brl_delay_inject1 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc_smb1/share', description="brl_delay_inject1") - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject2 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share', + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/brl_delay_inject2 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc_smb1/share', description="brl_delay_inject2") plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/ad_dc_smb1/share') elif t == "smb2.samba3misc":