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>

diff --git a/selftest/knownfail b/selftest/knownfail
index 1653ceaf31e161f4dadb1413f18c543348d07490..83e244b91db1970ac2a0462da227918e2beaf11f 100644 (file)
--- 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 c0738e98d77f706d80e27bdb0da4377c3e41f404..02b976ce605f747cef3c1d3f5130c85eb1262746 100644 (file)
--- 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);