From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 16 Aug 2019 10:28:39 +0000 (+0200)
Subject: s4:torture/raw: improvements for multilock2
X-Git-Tag: talloc-2.3.1~959
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a7039be530adcdda9e7e7621bdcf902f5ca1721;p=thirdparty%2Fsamba.git

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>
---

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);