rest

diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c
index 7961857473fa97ff01c3bb4e0ba52b510740c12c..6f02e091f24c5bef2c999040df2b2f05a5ad6f97 100644 (file)
--- a/source4/torture/smb2/multichannel.c
+++ b/source4/torture/smb2/multichannel.c
@@ -675,7 +675,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        smb2_util_close(tree1, h_client1_file2);
 
-       torture_comment(tctx, "client1 opens fname2 via session1 again\n");
+       torture_comment(tctx, "client1 opens fname2 via session 1 again\n");
 
        io2.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree1, mem_ctx, &io2);
@@ -688,7 +688,8 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_VAL(io2.out.durable_open_v2, false);
        CHECK_VAL(io2.out.timeout, 0);
        CHECK_VAL(io2.out.durable_open, false);
-       CHECK_VAL(break_info.count, 2);
+       torture_wait_for_oplock_break(tctx);
+       CHECK_VAL(break_info.count, 1);
        CHECK_PTR(break_info.received_transport, transport1);
 
        unblock_ok = torture_unblock_tcp_transport(tctx, transport2C);
@@ -733,7 +734,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        transport2C->oplock.handler = torture_oplock_ack_handler;
        transport2C->oplock.private_data = tree2C;
-       torture_comment(tctx, "transport2C[%p]\n", transport2C);
+       torture_comment(tctx, "transport2C [%p]\n", transport2C);
 
        torture_comment(tctx, "established transport 2C\n");
 
@@ -754,12 +755,13 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_VAL(io3.out.durable_open_v2, true);
        CHECK_VAL(io3.out.timeout, io3.in.timeout);
        CHECK_VAL(io3.out.durable_open, false);
+       torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 0);
 
        torture_comment(tctx, "explicit disconnect of transport2C\n");
        smbXcli_conn_disconnect(transport2C->conn, NT_STATUS_FOOBAR);
 
-       torture_comment(tctx, "client1 opens fname3 via session1\n");
+       torture_comment(tctx, "client1 opens fname3 via session 1\n");
 
        status = smb2_create(tree1, mem_ctx, &io3);
        CHECK_STATUS(status, NT_STATUS_OK);
@@ -769,6 +771,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_VAL(io3.out.durable_open_v2, false);
        CHECK_VAL(io3.out.timeout, 0);
        CHECK_VAL(io3.out.durable_open, false);
+       torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 1);
        CHECK_PTR(break_info.received_transport, transport2B);