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

Test samba3.raw.samba3posixtimedlock will not succeed in test
environments that don't support SMB1 so we move it to ad_dc_smb1
and also remove associated entry from skip_smb1_fail

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 22d5fd081f3bdb70f75ee91e1fc526dcd76b04b3..ca8c1725d15b78dcae374af0f2924c6e381521b7 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -22,7 +22,6 @@
 ^samba3.raw.samba3checkfsp\(simpleserver\)
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(simpleserver\)
-^samba3.raw.samba3posixtimedlock\(ad_dc\)
 ^samba3.raw.samba3posixtimedlock\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject1\(nt4_dc\)
 ^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 836d3bbd0206125ed9ac6a10ac8b2f9f3a21c4a7..bf986b68f078680767af1872192aacdb7cfaa418 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -592,7 +592,7 @@ for t in tests:
                                  description="brl_delay_inject1")
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject2 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share',
                                  description="brl_delay_inject2")
-        plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/ad_dc/share')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/ad_dc_smb1/share')
     elif t == "smb2.samba3misc":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/brl_delay_inject1 -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share',