From dd7218371a2faaee2e64d125d3a93ab2053cf571 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Fri, 13 Dec 2019 10:26:59 +0000 Subject: [PATCH] s3/selftest: Move samba3.base.rw1 to nt4_dc_smb1 Test samba3.base.rw1 only works in test environments that support SMB1 so move test to nt4_dc_smb1 and remove the entry from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 1 - source3/selftest/tests.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index dfd5500b57d..52a6969e010 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -6,7 +6,6 @@ # a) remove the failing test # b) port the failing test to SMB2 # c) fix the test -^samba3.base.rw1\(nt4_dc\) ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1\(ad_member\) ^samba3.blackbox.smbclient_auth.plain.--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1.member_creds\(ad_member\) ^samba3.blackbox.smbclient_auth.plain.--option=clientntlmv2auth=no --option=clientlanmanauth=yes --max-protocol=LANMAN2\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index e1be5a6ba7b..97b5e424142 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -621,9 +621,9 @@ for t in tests: plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD') elif t == "base.rw1": - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/valid-users-tmp -U$USERNAME%$PASSWORD') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/write-list-tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/valid-users-tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/write-list-tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "idmap.rfc2307": plantestsuite(t, "ad_member_rfc2307", -- 2.47.3