s3/selftest: Move samba3.unix.info2 to ad_dc_smb1 & nt4_dc_smb1

verified with

  python3 source3/selftest/tests.py  | grep _smb1 | grep "^samba3.unix" | sort -u

Additionally the test entries in skip_smb1_fail also removed

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index 256542e6b68581efa4711766c3bcb3ba07e4abc6..72975b555ef898f4aaedd0f654fcf891dde3d5f9 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -223,8 +223,6 @@
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW1\(simpleserver\)
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW2\(simpleserver\)
 ^samba3.smbtorture_s3.vfs_aio_pthread\(simpleserver\).RW3\(simpleserver\)
-^samba3.unix.info2\(ad_dc\)
-^samba3.unix.info2\(nt4_dc\)
 ^samba3.unix.whoami\(ad_dc\)
 ^samba3.unix.whoami\(ad_member\)
 ^samba3.unix.whoami anonymous connection\(ad_member\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 04a6888a9faf8282d3df0ac18aeacb9b6911f918..7b5571ea57e5b24af763d4ff7d84dc3a06f13be9 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -751,7 +751,8 @@ for t in tests:
     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") \
-        or (t in rap and t != "rap.printing"):
+        or (t in rap and t != "rap.printing") \
+        or (t in unix):
         plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     else: