From 25efadd5f36b9d8b01b22c1613ba0b9afeff5e18 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 11 Dec 2019 18:06:47 +0000 Subject: [PATCH] s3/selftest: Move samba3.rap.basic & samba3.rap.rpc to _smb1 env Tests: samba3.rap.basic samba3.rap.rpc have been moved to ad_dc_smb1, nt4_dc_smb1 verified by python3 source3/selftest/tests.py | grep ad_dc_smb1 | grep "^samba3.rap" these tests have been removed from skip_smb1_fails Additionally samba3.rap.basic.netsessiongetinfo was already marked as knownfail in ad_dc so in ad_dc_smb1 also true Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/knownfail | 2 +- selftest/skip_smb1_fails | 4 ---- source3/selftest/tests.py | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/selftest/knownfail b/selftest/knownfail index eaf05f3bec4..bac3ac62b2d 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -235,7 +235,7 @@ ^samba3.rpc.eventlog.eventlog.ReadEventLog\(ad_dc\) ^samba3.rpc.eventlog.eventlog.GetNumRecords\(ad_dc\) ^samba3.rpc.eventlog.eventlog.OpenEventLog\(ad_dc\) -^samba3.rap.basic.netsessiongetinfo\(ad_dc\) +^samba3.rap.basic.netsessiongetinfo\(ad_dc_smb1\) # not implemented ^samba3.rpc.svcctl.svcctl.ChangeServiceConfigW\(ad_dc\) ^samba3.rpc.svcctl.svcctl.ChangeServiceConfigW\(nt4_dc\) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index afb9eb0eca0..256542e6b68 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -32,10 +32,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.basic\(ad_dc\) -^samba3.rap.basic\(nt4_dc\) -^samba3.rap.rpc\(ad_dc\) -^samba3.rap.rpc\(nt4_dc\) ^samba3.rap.sam\(ad_dc\) ^samba3.rap.sam\(nt4_dc\) ^samba3.raw.acls\(ad_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 05279cdca76..04a6888a9fa 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -750,7 +750,8 @@ for t in tests: plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') elif t == "rpc.spoolss.notify": plansmbtorture4testsuite(t, "ad_member", '//$SERVER_IP/tmp -U$DC_USERNAME%$DC_PASSWORD') - elif (t in base and t != "base.charset"): + elif (t in base and t != "base.charset") \ + or (t in rap and t != "rap.printing"): plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD') else: -- 2.34.1