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 <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index eaf05f3bec40c51479b44e3fe36c960243dd3443..bac3ac62b2dab50e7a53e424dbb68791f39dc84b 100644 (file)
--- 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 afb9eb0eca04b62fd5e7fdb95bbe2ddee9a71ca5..256542e6b68581efa4711766c3bcb3ba07e4abc6 100644 (file)
--- 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 05279cdca7636b5cb8b7ef3edfcb677597b15ea8..04a6888a9faf8282d3df0ac18aeacb9b6911f918 100755 (executable)
--- 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: