s3/selftest: Move samba3.raw.read to ad_dc_smb1

Test samba3.raw.read fails in environments that don't support SMB1
so move it to ad_dc_smb1 and also remove the entry in skip_smb1_fails

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 99803fb8d4120b633fd90c714f365e3ceee03a69..f472ff0c86bee6ea2642a654bf1b221d0f873a5d 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -43,7 +43,6 @@
 ^samba3.raw.lock\(nt4_dc\)
 ^samba3.raw.notify\(nt4_dc\)
 ^samba3.raw.oplock\(nt4_dc\)
-^samba3.raw.read\(ad_dc\)
 ^samba3.raw.read aio\(nt4_dc\)
 ^samba3.raw.read\(nt4_dc\)
 ^samba3.raw.samba3checkfsp\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index cf20b965bd3a627af09f2e7db827396b741ce701..f9c2ab3a0d7efb04034765fc894e8526e9e44046 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -662,7 +662,7 @@ for t in tests:
     elif t == "raw.read":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/aio -U$USERNAME%$PASSWORD', 'aio')
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     elif t == "raw.search":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
 # test the dirsort module.