unit tests: use skip file to exclude smb2.dir instead of hack

Thanks metze for pointing this.

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Thu Oct 28 09:39:11 UTC 2010 on sn-devel-104

diff --git a/source4/selftest/skip b/source4/selftest/skip
index e03234b3ca0105684bf07214d2550dd86b44365b..671269a8fda900ca51c334a0566b275df538b1ce 100644 (file)
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -32,6 +32,7 @@ smb2.notify
 smb2.scan
 smb2.lease
 smb2.durable.open
+smb2.dir
 ntvfs.cifs.base.charset
 ntvfs.cifs.base.iometer
 ntvfs.cifs.base.casetable

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index a252a87d081f3ecc751f97a81ed581a4ea6fc914..9d4d2b37822bbebace1d7dc6bbc09cdd2271300d 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -314,7 +314,7 @@ plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, 'ncacn_np:$
 # Tests against the NTVFS POSIX backend
 ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
 
-smb2 = filter(lambda x: "SMB2-DIR" not in x, smb4torture_testsuites("SMB2-"))
+smb2 = smb4torture_testsuites("SMB2-")
 #The QFILEINFO-IPC test needs to be on ipc$
 raw = filter(lambda x: "RAW-QFILEINFO-IPC" not in x, smb4torture_testsuites("RAW-"))
 base = smb4torture_testsuites("BASE-")