summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2010-10-28 12:20:28 +0400
committerMatthieu Patou <mat@samba.org>2010-10-28 09:39:11 +0000
commit917cc0db0ce40b555ef3f752e5a546373316b162 (patch)
tree799a3a891d588c30f8930d6474f585e12afe1fed /source4
parent95cbff76d6b88174806205fe6a1ad4a91c8d92c6 (diff)
downloadsamba-917cc0db0ce40b555ef3f752e5a546373316b162.tar.gz
samba-917cc0db0ce40b555ef3f752e5a546373316b162.tar.bz2
samba-917cc0db0ce40b555ef3f752e5a546373316b162.zip
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
Diffstat (limited to 'source4')
-rw-r--r--source4/selftest/skip1
-rwxr-xr-xsource4/selftest/tests.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/selftest/skip b/source4/selftest/skip
index e03234b3ca..671269a8fd 100644
--- 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 a252a87d08..9d4d2b3782 100755
--- 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-")