s3-selftest: Remove .posix_s3 from s3 test names

As far as I can tell, this simply referred to the posix_s3.sh script
that originally ran these tests.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Feb 16 06:57:09 CET 2012 on sn-devel-104

diff --git a/selftest/flapping b/selftest/flapping
index 1b8fb9cc7b8940abbedcf28b2f6f460c9bec6ad4..2828d67ceb39878057590299d8ca3a55c4d88471 100644 (file)
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -11,10 +11,10 @@
 ^samba3.raw.mux.* #This test is flaky on the async lock time
 ^samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel
 ^samba4.nbt.winsreplication.owned # fails sometimes, timing related
-^samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
-^samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
+^samba3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
+^samba3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
 .*printer.*print_test_extended # fails on some hosts due to timing issues ?
 .*printer.*print_test # fails on some hosts due to timing issues ?
-.*posix_s3.rpc.spoolss.printer # seems to be flakey currently, but should be fixed
-^samba3.posix_s3.rap.printing # fails sometimes on sn-devel
-^samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure
+.*rpc.spoolss.printer # seems to be flakey currently, but should be fixed
+^samba3.rap.printing # fails sometimes on sn-devel
+^samba3.smb2.lock.*.rw-exclusive # another intermittent failure

diff --git a/selftest/knownfail b/selftest/knownfail
index 40c3995d0a4aeb80a30c4b710c6f9b6a6b1172fd..e99f5d477b9bbf02767f1be4e38ce16ecb7c5f10 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -7,13 +7,13 @@
 ^samba3.blackbox.failure.failure # this is designed to fail, for testing our test infrastructure
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
 ^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
-^samba3.posix_s3.nbt.dgram.*netlogon2
+^samba3.nbt.dgram.*netlogon2
 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3
 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3
-^samba3.posix_s3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
+^samba3.libsmbclient .opendir # This requires a workgroup called 'WORKGROUP' and for netbios browse lists to have been registered
 # see bug 8412
-^samba3.posix_s3.smb2.rename.*.simple_nodelete
-^samba3.posix_s3.smb2.rename.*.no_share_delete_no_delete_access
+^samba3.smb2.rename.*.simple_nodelete
+^samba3.smb2.rename.*.no_share_delete_no_delete_access
 #These rpcclient combinations (pipe-level authentication but without sign or seal) need fixing in s3
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego\]
 ^samba3.blackbox.rpcclient over ncacn_np with \[spnego,bigendian\]

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 662d275bc9870f299db73f5d94a120a3d002d283..8d1c536ee7849c88d671c9e1140880c6feb08c83 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -51,7 +51,7 @@ sub.communicate("")
 smb4torture_possible = (sub.returncode == 0)
 
 def plansmbtorturetestsuite(name, env, options, description=''):
-    modname = "samba3.posix_s3.%s %s" % (name, description)
+    modname = "samba3.%s %s" % (name, description)
     cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
     if smb4torture_possible:
         plantestsuite_loadlist(modname, env, cmdline)