diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-16 12:28:39 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-09-09 16:04:29 +0000 |
| commit | da765a062aa4b57814ea426c94c6b3ba23dca47c (patch) | |
| tree | 65d164f8605d9c5348f3f8055dae4d3198c22913 /source4 | |
| parent | c4d7c186aca3b9fb42354ac47f10514468b4c8b7 (diff) | |
| download | samba-da765a062aa4b57814ea426c94c6b3ba23dca47c.tar.gz | |
s4:torture/raw: improvements for multilock2
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 8a7039be530adcdda9e7e7621bdcf902f5ca1721)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/raw/lock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index f1fbdd6da71..f264d0aea11 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -2449,7 +2449,7 @@ static bool test_multilock2(struct torture_context *tctx, lock[0].pid = cli->session->pid+2; io.lockx.in.lock_cnt = 1; req2 = smb_raw_lock_send(cli->tree, &io); - torture_assert(tctx,(req != NULL), talloc_asprintf(tctx, + torture_assert(tctx,(req2 != NULL), talloc_asprintf(tctx, "Failed to setup timed locks (%s)\n", __location__)); /* Unlock lock[0] */ @@ -2465,6 +2465,9 @@ static bool test_multilock2(struct torture_context *tctx, status = smbcli_request_simple_recv(req2); CHECK_STATUS(status, NT_STATUS_FILE_LOCK_CONFLICT); + torture_assert(tctx, req->state <= SMBCLI_REQUEST_RECV, + "req should still wait"); + /* Start the clock. */ t = time_mono(NULL); |