Revert "test_delayed_write_update TODO: research PATHINFO => DEFER_CHANGE_ON_CLOSE"

This reverts commit c666c2a9f1cd123ef4ba2c4d60ff63eb1bfaec2f.

diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index b53ec0ada35e2e306b0ab6d2663d141577630d32..5b4fbc2b6e3b409eac8ee34a34f5611774c4b711 100644 (file)
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -72,19 +72,13 @@ static bool test_delayed_write_update(struct torture_context *tctx, struct smbcl
        torture_assert_int_equal(tctx, written, 1,
                                 "unexpected number of bytes written");
 
-       start = timeval_current();
-               //smb_msleep(5 * msec);
        pinfo1.basic_info.level = RAW_FILEINFO_BASIC_INFO;
-       pinfo1.basic_info.level = RAW_FILEINFO_MODE_INFORMATION;
        pinfo1.basic_info.in.file.path = fname;
        status = smb_raw_pathinfo(cli->tree, tctx, &pinfo1);
        torture_assert_ntstatus_ok(tctx, status, "pathinfo failed");
 
-       //written =  smbcli_write(cli->tree, fnum1, 0, "x", 0, 1);
-       //torture_assert_int_equal(tctx, written, 1,
-       //                       "unexpected number of bytes written");
-
-       end = timeval_add(&start, (30 * sec), 0);
+       start = timeval_current();
+       end = timeval_add(&start, (120 * sec), 0);
        while (!timeval_expired(&end)) {
                status = smb_raw_fileinfo(cli->tree, tctx, &finfo2);
 
@@ -113,16 +107,14 @@ static bool test_delayed_write_update(struct torture_context *tctx, struct smbcl
                smb_msleep(1 * msec);
        }
 
-       //torture_assert_u64_not_equal(tctx,
-       //                           finfo2.basic_info.out.write_time,
-       //                           finfo1.basic_info.out.write_time,
-       //                           "Server did not update write time within "
-       //                           "120 seconds");
+       torture_assert_u64_not_equal(tctx,
+                                    finfo2.basic_info.out.write_time,
+                                    finfo1.basic_info.out.write_time,
+                                    "Server did not update write time within "
+                                    "120 seconds");
 
        if (fnum1 != -1)
                smbcli_close(cli->tree, fnum1);
-       status = smb_raw_pathinfo(cli->tree, tctx, &pinfo1);
-       torture_assert_ntstatus_ok(tctx, status, "pathinfo failed");
        smbcli_unlink(cli->tree, fname);
        smbcli_deltree(cli->tree, BASEDIR);