From 8ab2c60305d85518c55cb4872709521cf374fae7 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 11 Dec 2019 18:32:29 +0000 Subject: [PATCH] s3/sefltest: Move samba3.rap.sam to ad_dc_smb1 environment Test samba3.rap.sam fails in environments that don't support SMB1 so we move it to enironment ad_dc_smb1 and remove the entry in skip_smb1_fails Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/skip_smb1_fails | 1 - source3/selftest/tests.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index ab4d1688f86..224253594cd 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -31,7 +31,6 @@ ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\) -^samba3.rap.sam\(ad_dc\) ^samba3.rap.sam\(nt4_dc\) ^samba3.raw.acls\(ad_dc\) ^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 71282012290..042463b2ea2 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -563,7 +563,7 @@ for t in tests: plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD -k yes --maximum-runtime=900') elif t == "rap.sam": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1') - plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1') + plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=doscharset=ISO-8859-1') elif t == "winbind.pac": plansmbtorture4testsuite(t, "ad_member:local", '//$SERVER/tmp --realm=$REALM --machine-pass --option=torture:addc=$DC_SERVER', description="machine account") elif t == "unix.whoami": -- 2.47.3