s3-selftest Add all the LOCAL-* smbtorture tests to make test

The extra knownfail and skip entries are for tests the currently do
not pass or hang.  We need to work out why this happens, and fix the
test or the test invocation.

Andrew Bartlett

diff --git a/selftest/knownfail b/selftest/knownfail
index 7f023211f6e13fdfd936f95c272101082f151008..6f838818680266598f4eed75a2a8660dc8bb8ebf 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -14,6 +14,8 @@
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
 ^samba3.raw.mux.* #This test is flaky on the async lock time
 ^samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel
+^samba3.smbtorture_s3.LOCAL-MEMCACHE #fails
+^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
 ^samba3.posix_s3.nbt.dgram.*netlogon2
 ^samba3.*rap.sam.*.useradd # Not provided by Samba 3
 ^samba3.*rap.sam.*.userdelete # Not provided by Samba 3

diff --git a/selftest/skip b/selftest/skip
index 686ccdb0e731b45aa137afd1e5e4d3061e21c1fe..5be321e9ad67d0a6ca0b86f630ee362eed77092f 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -32,6 +32,7 @@
 ^samba3.smbtorture_s3.*.mangle
 ^samba3.smbtorture_s3.*.utable
 ^samba3.smbtorture_s3.*.pipe_number
+^samba3.smbtorture_s3.LOCAL-DBTRANS #hangs for some reason
 ^samba3.*base.charset
 ^samba3.*raw.acls
 ^samba3.*raw.composite

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 064f13482ba300110e1b8d09e5da6ee6a8085559..02afde58299f25984750c0e59308cdb90566aacb 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -60,13 +60,32 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7",
         "GETADDRINFO", "POSIX", "UID-REGRESSION-TEST", "SHORTNAME-TEST",
         "LOCAL-BASE64", "LOCAL-GENCACHE", "POSIX-APPEND",
         "CASE-INSENSITIVE-CREATE", "SMB2-BASIC", "NTTRANS-FSCTL",
-        "BAD-NBT-SESSION",
-        "LOCAL-string_to_sid", "LOCAL-CONVERT-STRING", "LOCAL-sprintf_append"]
+        "BAD-NBT-SESSION"]
 
 for t in tests:
     plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
     plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e", "-l $LOCAL_PATH"])
 
+local_tests=[
+       "LOCAL-SUBSTITUTE",
+       "LOCAL-GENCACHE",
+       "LOCAL-TALLOC-DICT",
+       "LOCAL-BASE64",
+       "LOCAL-RBTREE",
+       "LOCAL-MEMCACHE",
+       "LOCAL-STREAM-NAME",
+       "LOCAL-WBCLIENT",
+       "LOCAL-string_to_sid",
+       "LOCAL-binary_to_sid",
+       "LOCAL-DBTRANS",
+       "LOCAL-TEVENT-SELECT",
+       "LOCAL-CONVERT-STRING",
+       "LOCAL-CONV-AUTH-INFO",
+       "LOCAL-sprintf_append"]
+
+for t in local_tests:
+    plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e"])
+
 tests=["--ping", "--separator",
        "--own-domain",
        "--all-domains",