diff options
| author | Michael Adam <obnox@samba.org> | 2014-10-02 13:46:29 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-10-03 08:34:05 +0200 |
| commit | 2e1cb1284820caa5920d26f6b859b0287e82670c (patch) | |
| tree | ccaa659de1771caba18daede1c7be02e44160d30 /source4 | |
| parent | de8dcdef3ee42e88a50fe689e11d0b4448019ba5 (diff) | |
| download | samba-2e1cb1284820caa5920d26f6b859b0287e82670c.tar.gz samba-2e1cb1284820caa5920d26f6b859b0287e82670c.tar.xz samba-2e1cb1284820caa5920d26f6b859b0287e82670c.zip | |
s4:torture:basic: use assert in the second loop in delayed_write_update1a
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>
Diffstat (limited to 'source4')
| -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 16223f8b5c..a15abe0657 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -396,22 +396,21 @@ static bool test_delayed_write_update1a(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_result(tctx, TORTURE_FAIL, "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_int_equal(tctx, - finfo3.all_info.out.write_time, - finfo2.all_info.out.write_time, - "Server updated write time (wrong!)"); + 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); |