summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-09 15:27:50 +0200
committerStefan Metzmacher <metze@samba.org>2012-09-08 23:18:39 +0200
commit7a51c5e46959d2f142052a2f9799ac5a44b99345 (patch)
tree99cedcb7990f3bcf4087586800772ffcddb1c583
parenteabe4c8fc4f8ba7ac75ceb9924cd5a90ff14470d (diff)
downloadsamba-7a51c5e46959d2f142052a2f9799ac5a44b99345.tar.gz
samba-7a51c5e46959d2f142052a2f9799ac5a44b99345.tar.bz2
samba-7a51c5e46959d2f142052a2f9799ac5a44b99345.zip
selftest/knownfail: we pass some samba3.smb2.durable-* tests now
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Sat Sep 8 23:18:39 CEST 2012 on sn-devel-104
-rw-r--r--selftest/knownfail14
-rwxr-xr-xselftest/target/Samba3.pm5
-rw-r--r--selftest/target/Samba4.pm6
-rwxr-xr-xsource3/selftest/tests.py3
4 files changed, 14 insertions, 14 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index b81dbfb0b6..094b2a44fa 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -175,24 +175,10 @@
^samba3.smb2.notify.valid-req
^samba3.smb2.notify.dir
^samba3.smb2.notify.rec
-^samba3.smb2.durable-open.file-position
-^samba3.smb2.durable-open.alloc-size
-^samba3.smb2.durable-open.lease
-^samba3.smb2.durable-open.lock-oplock
^samba3.smb2.durable-open.lock-lease
-^samba3.smb2.durable-open.open
-^samba3.smb2.durable-open.reopen1
-^samba3.smb2.durable-open.reopen2
-^samba3.smb2.durable-open.reopen2a
-^samba3.smb2.durable-open.reopen3
^samba3.smb2.durable-open.reopen4
^samba3.smb2.durable-open.delete_on_close1
-^samba3.smb2.durable-open.oplock
-^samba3.smb2.durable-v2-open.open-oplock
^samba3.smb2.durable-v2-open.open-lease
-^samba3.smb2.durable-v2-open.reopen1
-^samba3.smb2.durable-v2-open.reopen2
-^samba3.smb2.durable-v2-open.persistent-open-oplock
^samba3.smb2.durable-v2-open.persistent-open-lease
^samba3.smb2.ioctl.shadow_copy
^samba3.smb2.ioctl.req_resume_key
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 943e922e5e..c1f8fbd3c0 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -981,6 +981,11 @@ sub provision($$$$$$)
[hideunwrite]
copy = tmp
hide unwriteable files = yes
+[durable]
+ copy = tmp
+ kernel share modes = no
+ kernel oplocks = no
+ posix locking = no
[print1]
copy = tmp
printable = yes
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index d2e890e53b..9563da642d 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1419,6 +1419,12 @@ sub provision_plugin_s4_dc($$)
copy = tmp
hide unreadable = yes
+[durable]
+ copy = tmp
+ kernel share modes = no
+ kernel oplocks = no
+ posix locking = no
+
[print\$]
copy = tmp
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index f6b8c01de3..f887f7f597 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -355,6 +355,9 @@ for t in tests:
plansmbtorturetestsuite(t, "s3dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'over ncacn_np ')
plansmbtorturetestsuite(t, "plugin_s4_dc", 'ncacn_ip_tcp:$SERVER_IP -U$USERNAME%$PASSWORD', 'over ncacn_ip_tcp ')
+ elif t == "smb2.durable-open" or t == "smb2.durable-v2-open":
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD')
+ plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/durable -U$USERNAME%$PASSWORD')
else:
plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')