Remove unnecessary checks in multichannel lease break testing
authorSachin Prabhu <sprabhu@redhat.com>
Thu, 15 Feb 2018 11:38:47 +0000 (17:08 +0530)
committerSachin Prabhu <sprabhu@redhat.com>
Tue, 17 Jul 2018 20:46:27 +0000 (21:46 +0100)
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
source4/torture/smb2/multichannel.c

index 808ceca5c6932533833ee3d06e7611202face1fb..f47fcad825e6f3397f6a3ef211fb9f8ead2f7491 100644 (file)
@@ -930,9 +930,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        h_client2_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io1, "RHW", true, LEASE2F1, 0);
-       CHECK_VAL(io1.out.durable_open_v2, true);
-       CHECK_VAL(io1.out.timeout, io1.in.timeout);
-       CHECK_VAL(io1.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
        /* 2b opens file2 */
@@ -942,9 +939,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        h_client2_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io2, "RHW", true, LEASE2F2, 0);
-       CHECK_VAL(io2.out.durable_open_v2, true);
-       CHECK_VAL(io2.out.timeout, io2.in.timeout);
-       CHECK_VAL(io2.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
        /* 2c opens file3 */
@@ -956,9 +950,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        h_client2_file3 = io3.out.file.handle;
        CHECK_CREATED(&io3, CREATED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io3, "RHW", true, LEASE2F3, 0);
-       CHECK_VAL(io3.out.durable_open_v2, false);
-       CHECK_VAL(io3.out.timeout, io3.in.timeout);
-       CHECK_VAL(io3.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
        /*
@@ -975,9 +966,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        CHECK_CREATED(&io1, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io1, "RH", true, LEASE1F1, 0);
        CHECK_BREAK_INFO("RHW", "RH", LEASE2F1);
-       CHECK_VAL(io1.out.durable_open_v2, false);
-       CHECK_VAL(io1.out.timeout, 0);
-       CHECK_VAL(io1.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 1);
        CHECK_PTR(lease_break_info.lease_transport, transport2A);
 
@@ -997,9 +985,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io2, "RH", true, LEASE1F2, 0);
        CHECK_BREAK_INFO("RHW", "RH", LEASE2F2);
-       CHECK_VAL(io2.out.durable_open_v2, false);
-       CHECK_VAL(io2.out.timeout, 0);
-       CHECK_VAL(io2.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 1);
        CHECK_PTR(lease_break_info.lease_transport, transport2A);
 
@@ -1019,9 +1004,6 @@ static bool test_multichannel_lease_break_test1(struct torture_context *tctx,
        CHECK_CREATED(&io3, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io3, "RH", true, LEASE1F3, 0);
        CHECK_BREAK_INFO("RHW", "RH", LEASE2F3);
-       CHECK_VAL(io3.out.durable_open_v2, false);
-       CHECK_VAL(io3.out.timeout, 0);
-       CHECK_VAL(io3.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 1);
        CHECK_PTR(lease_break_info.lease_transport, transport2A);
 
@@ -1179,9 +1161,6 @@ static bool test_multichannel_lease_break_test2(struct torture_context *tctx,
        h_client2_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io1, "RHW", true, LEASE2F1, 0);
-       CHECK_VAL(io1.out.durable_open_v2, false); //true);
-       CHECK_VAL(io1.out.timeout, io1.in.timeout);
-       CHECK_VAL(io1.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
        /* 2b opens file2 */
@@ -1193,9 +1172,6 @@ static bool test_multichannel_lease_break_test2(struct torture_context *tctx,
        h_client2_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io2, "RHW", true, LEASE2F2, 0);
-       CHECK_VAL(io2.out.durable_open_v2, false); //true);
-       CHECK_VAL(io2.out.timeout, io2.in.timeout);
-       CHECK_VAL(io2.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 0);
 
 
@@ -1219,10 +1195,6 @@ static bool test_multichannel_lease_break_test2(struct torture_context *tctx,
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io2, "RH", true, LEASE1F2, 0);
        CHECK_BREAK_INFO("RHW", "RH", LEASE2F2);
-       CHECK_VAL(io2.out.durable_open_v2, false);
-       CHECK_VAL(io2.out.timeout, 0);
-       CHECK_VAL(io2.out.durable_open, false);
-
        CHECK_VAL(lease_break_info.count, 1);
        torture_reset_lease_break_info(tctx, &lease_break_info);
 
@@ -1254,9 +1226,6 @@ static bool test_multichannel_lease_break_test2(struct torture_context *tctx,
        CHECK_CREATED(&io1, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
        CHECK_LEASE(&io1, "RH", true, LEASE1F1, 0);
        CHECK_BREAK_INFO("RHW", "RH", LEASE2F1);
-       CHECK_VAL(io1.out.durable_open_v2, false);
-       CHECK_VAL(io1.out.timeout, 0);
-       CHECK_VAL(io1.out.durable_open, false);
        CHECK_VAL(lease_break_info.count, 1);
 
        torture_comment(tctx, "client closes fname1 via session 2A\n");