From bc93c8249b4ad93bebc590dede241d80f86f0291 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 2 Oct 2014 15:58:05 +0200 Subject: [PATCH] s4:torture:basic: use assert in the second loop in delayed_write_update1 We can hence replace the assert after the loop by a success torture_comment. Signed-off-by: Michael Adam Reviewed-by: Andrew Bartlett --- source4/torture/basic/delaywrite.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 284fa929052..edb3dc9a917 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -231,22 +231,21 @@ static bool test_delayed_write_update1(struct torture_context *tctx, struct smbc 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" - "(wrong)\n", - diff); - 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 (wrong!)"); + torture_comment(tctx, "Server did not update write time within 10 " + "seconds. Good!\n"); fflush(stdout); smb_msleep(2 * msec); -- 2.34.1