modern and legacy delaywrite

diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index be75533243d13af56f74b42aee1c1c9c38700a88..42a00e30596d7eb61d49da2e5bedec4d4532777c 100644 (file)
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -44,8 +44,8 @@ static bool test_delayed_write_update(struct torture_context *tctx, struct smbcl
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -125,8 +125,8 @@ static bool test_delayed_write_update1(struct torture_context *tctx, struct smbc
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        char buf[2048];
@@ -291,8 +291,8 @@ static bool test_delayed_write_update1a(struct torture_context *tctx, struct smb
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        char buf[2048];
@@ -452,8 +452,8 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        char buf[2048];
@@ -612,8 +612,8 @@ static bool test_delayed_write_update1c(struct torture_context *tctx, struct smb
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        char buf[2048];
@@ -776,8 +776,8 @@ static bool test_delayed_write_update2(struct torture_context *tctx, struct smbc
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        union smb_flush flsh;
@@ -1134,8 +1134,8 @@ static bool test_finfo_after_write(struct torture_context *tctx, struct smbcli_s
        int fnum2;
        bool ret = true;
        ssize_t written;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -1410,8 +1410,8 @@ static bool test_delayed_write_update3(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -1562,8 +1562,8 @@ static bool test_delayed_write_update3a(struct torture_context *tctx,
        int i;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -1773,8 +1773,8 @@ static bool test_delayed_write_update3b(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -1937,8 +1937,8 @@ static bool test_delayed_write_update3c(struct torture_context *tctx,
        int i;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -2143,8 +2143,8 @@ static bool test_delayed_write_update4(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -2300,8 +2300,8 @@ static bool test_delayed_write_update5(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -2460,8 +2460,8 @@ static bool test_delayed_write_update5b(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
 
@@ -2625,8 +2625,8 @@ static bool test_delayed_write_update6(struct torture_context *tctx,
        ssize_t written;
        struct timeval start;
        struct timeval end;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        bool first = true;
@@ -2989,8 +2989,8 @@ static bool test_directory_update8(struct torture_context *tctx, struct smbcli_s
        int fnum1 = -1;
        int fnum2 = -1;
        bool ret = true;
-       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 2000000);
-       int normal_delay = 2000000;
+       double used_delay = torture_setting_int(tctx, "writetimeupdatedelay", 1000000);
+       int normal_delay = 1000000;
        double sec = ((double)used_delay) / ((double)normal_delay);
        int msec = 1000 * sec;
        TALLOC_CTX *mem_ctx = talloc_init("test_delayed_write_update8");
@@ -3341,7 +3341,6 @@ struct torture_suite *torture_delay_write_modern(TALLOC_CTX *ctx)
        torture_suite_add_2smb_test(suite, "delayed update of write time 3a", test_delayed_write_update3a);
        torture_suite_add_2smb_test(suite, "delayed update of write time 3b", test_delayed_write_update3b);
        torture_suite_add_2smb_test(suite, "delayed update of write time 3c", test_delayed_write_update3c);
-       torture_suite_add_2smb_test(suite, "delayed update of write time 4", test_delayed_write_update4);
        torture_suite_add_2smb_test(suite, "delayed update of write time 5", test_delayed_write_update5);
        torture_suite_add_2smb_test(suite, "delayed update of write time 5b", test_delayed_write_update5b);
        torture_suite_add_2smb_test(suite, "delayed update of write time 6", test_delayed_write_update6);