diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-19 16:30:16 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-09-09 16:04:29 +0000 |
| commit | 85b9b5f04fdf7fa432f7260b27f77342f27dddbb (patch) | |
| tree | a0e6447e41f0b9fa98d58996ecdb8860a2055297 | |
| parent | 1fd0a52e6727b191aa008f7a260ad748d34d5870 (diff) | |
| download | samba-85b9b5f04fdf7fa432f7260b27f77342f27dddbb.tar.gz | |
s4:torture/raw: assert to get LOCK_NOT_GRANTED in torture_samba3_posixtimedlock()
There should not be a different if the blocker is a posix process
instead of another smbd.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 2a77025a1e16d897281e5840192c93fa03328681)
| -rw-r--r-- | selftest/knownfail.d/samba3posixtimedlock | 1 | ||||
| -rw-r--r-- | source4/torture/raw/samba3misc.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/selftest/knownfail.d/samba3posixtimedlock b/selftest/knownfail.d/samba3posixtimedlock new file mode 100644 index 00000000000..56d2d349e1e --- /dev/null +++ b/selftest/knownfail.d/samba3posixtimedlock @@ -0,0 +1 @@ +^samba3.raw.samba3posixtimedlock.samba3posixtimedlock diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index dc460b9cd8b..2f484023bea 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -775,8 +775,8 @@ static void receive_lock_result(struct smbcli_request *req) } /* - * Check that Samba3 correctly deals with conflicting posix byte range locks - * on an underlying file + * Check that Samba3 correctly deals with conflicting local posix byte range + * locks on an underlying file via "normal" SMB1 (without unix extentions). * * Note: This test depends on "posix locking = yes". * Note: To run this test, use "--option=torture:localdir=<LOCALDIR>" @@ -873,7 +873,7 @@ bool torture_samba3_posixtimedlock(struct torture_context *tctx, struct smbcli_s status = smb_raw_lock(cli->tree, &io); ret = true; - CHECK_STATUS(tctx, status, NT_STATUS_FILE_LOCK_CONFLICT); + CHECK_STATUS(tctx, status, NT_STATUS_LOCK_NOT_GRANTED); if (!ret) { goto done; |