diff options
| author | Michael Adam <obnox@samba.org> | 2014-10-02 16:46:18 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-03 08:34:06 +0200 |
| commit | 2907950f13506a0ca2160b72824e315772a4424f (patch) | |
| tree | 49f7f8a656fb4a44b0a77bebefb57d5c1ae3af01 | |
| parent | 08432cd88f8764eb87545f193f8db4750104bfce (diff) | |
| download | samba-2907950f13506a0ca2160b72824e315772a4424f.tar.gz samba-2907950f13506a0ca2160b72824e315772a4424f.tar.xz samba-2907950f13506a0ca2160b72824e315772a4424f.zip | |
s4:torture:basic: use assert in the second loop in delayed_write_update1b
We can hence replace the assert after the loop by a success torture_comment.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/torture/basic/delaywrite.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index b08568448e..51405e2a26 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -556,22 +556,21 @@ static bool test_delayed_write_update1b(struct torture_context *tctx, struct smb torture_comment(tctx, "write time %s\n", nt_time_string(tctx, finfo3.all_info.out.write_time)); - if (finfo2.all_info.out.write_time != finfo3.all_info.out.write_time) { - double diff = timeval_elapsed(&start); - torture_comment(tctx, "server updated write_time after %.2f seconds" - "(write time update delay == %.2f)(correct)\n", - diff, used_delay / (double)1000000); - break; - } + torture_assert_u64_equal(tctx, + finfo3.all_info.out.write_time, + finfo2.all_info.out.write_time, + talloc_asprintf(tctx, + "Server updated write time " + "after %.2f seconds (wrong!)", + timeval_elapsed(&start))); + fflush(stdout); smb_msleep(1 * msec); } - torture_assert_u64_equal(tctx, - finfo3.all_info.out.write_time, - finfo2.all_info.out.write_time, - "Server updated write time"); + torture_comment(tctx, "Server did not update write time within 10 " + "seconds. Good!\n"); /* the close should trigger an write time update */ smbcli_close(cli->tree, fnum1); |