summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-09-25 15:33:42 -0700
committerStefan Metzmacher <metze@samba.org>2013-10-23 11:49:05 +0200
commit96faaf6c1ed818fc0aadcb478e9f8b20568d7547 (patch)
tree3902e12e9fe03be21cca7d3abcda3b1c7ab1caa9
parent9890a6a36df98bae501845764a9579c9c75c5188 (diff)
downloadsamba-96faaf6c1ed818fc0aadcb478e9f8b20568d7547.tar.gz
samba-96faaf6c1ed818fc0aadcb478e9f8b20568d7547.tar.bz2
samba-96faaf6c1ed818fc0aadcb478e9f8b20568d7547.zip
torture: Check break level in raw.oplock.exclusive5
This is what Windows does in this case, we don't survive that. We break to LEVEL2 here. Fixes and more precise test to follow. We don't survive this anymore. Re-enable later. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--selftest/knownfail2
-rw-r--r--source4/torture/raw/oplock.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/selftest/knownfail b/selftest/knownfail
index 1653ceaf31..83e244b91d 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -61,6 +61,7 @@
^samba3.raw.acls nfs4acl_xattr-special.inheritance\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\)
+^samba3.raw.oplock.exclusive5
^samba3.base.delete.deltest16a
^samba3.base.delete.deltest17a
^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token
@@ -140,6 +141,7 @@
^samba4.raw.sfileinfo.*.end-of-file\(.*\)$ # bug 6962
^samba4.raw.oplock.*.batch22 # bug 6963
^samba4.raw.oplock.*.doc1
+^samba4.raw.oplock.*.exclusive5
^samba4.raw.lock.*.zerobyteread # bug 6974
^samba4.smb2.lock.*.zerobyteread # bug 6974
^samba4.raw.streams.*.delete
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index c0738e98d7..02b976ce60 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -638,6 +638,7 @@ static bool test_raw_oplock_exclusive5(struct torture_context *tctx, struct smbc
CHECK_VAL(io.ntcreatex.out.oplock_level, LEVEL_II_OPLOCK_RETURN);
torture_wait_for_oplock_break(tctx);
CHECK_VAL(break_info.count, get_break_level1_to_none_count(tctx));
+ CHECK_VAL(break_info.level, OPLOCK_BREAK_TO_NONE);
CHECK_VAL(break_info.failures, 0);
smbcli_close(cli1->tree, fnum);