summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-05 14:28:15 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-03-05 08:15:05 +0100
commitfc5762388a725cd18d10a356960382ea050c8064 (patch)
treed62c3efca57394d3c12e2deac573c7057ab83677
parent4c926a708d5d9a4b5e986b8aa18cdb95e8dc0142 (diff)
downloadsamba-fc5762388a725cd18d10a356960382ea050c8064.tar.gz
samba-fc5762388a725cd18d10a356960382ea050c8064.tar.bz2
samba-fc5762388a725cd18d10a356960382ea050c8064.zip
selftest: run smbtorture_s3 tests against the ntvfs file server
This checks not only the behaviour of the NTVFS file server, but also the client library and authentication stack. Andrew Bartlett
-rw-r--r--selftest/knownfail13
-rw-r--r--selftest/target/Samba4.pm3
-rwxr-xr-xsource3/selftest/tests.py1
3 files changed, 16 insertions, 1 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index cc5d16b1ac..1a6c6bd518 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -7,6 +7,19 @@
^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.smbtorture_s3.plain\(dc\).LOCK9 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).OPLOCK2 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).STREAMERROR # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DIR1 # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DIR-CREATETIME # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).DELETE-LN # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).POSIX # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).UID-REGRESSION-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).SHORTNAME-TEST # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).POSIX-APPEND # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).NTTRANS-FSCTL # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).SMB2-NEGPROT # Fails against the s4 ntvfs server
+^samba3.smbtorture_s3.plain\(dc\).BAD-NBT-SESSION # Fails against the s4 ntvfs server
^samba3.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/target/Samba4.pm b/selftest/target/Samba4.pm
index fb67c43350..698cd127a0 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -679,7 +679,8 @@ nogroup:x:65534:nobody
SAMBA_TEST_FIFO => "$ctx->{prefix}/samba_test.fifo",
SAMBA_TEST_LOG => "$ctx->{prefix}/samba_test.log",
SAMBA_TEST_LOG_POS => 0,
- NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so")
+ NSS_WRAPPER_WINBIND_SO_PATH => Samba::bindir_path($self, "default/nsswitch/libnss-winbind.so"),
+ LOCAL_PATH => $ctx->{tmpdir}
};
return $ret;
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index d14f18b477..c3f5594209 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -74,6 +74,7 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7",
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"])
+ plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
local_tests=[
"LOCAL-SUBSTITUTE",