sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4:torture:basic: eliminate potential for false failures in delayed_write_update1a

Browse Source 
We want to test that the write did update the write time immediately.
We check this by getting the file info in a loop for a few seconds.
There are several result cases:

- the server updated the write time immediately - success
- the server updated the write time, but not immediately - failure
- the server did not update the write time - failure

The loop is only there to be able to discern between the two
failure cases. The check for success is whether the first
getinfo has reportet the updated write time.

The potential for false failures was the additional timing check.
So if the first fileinfo call just took too long (e.g. due to a
busy system), this was reported as failure.

This patch should eliminate interemittent autobuild failures.

Signed-off-by: Michael Adam <obnox@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Michael Adam 2014-10-02 13:56:43 +02:00 committed by Andrew Bartlett
parent 2e1cb12848
commit 372d91b38b
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source4/torture/basic/delaywrite.c
View File

@ -295,6 +295,8 @@ static bool test_delayed_write_update1a(struct torture_context *tctx, struct smb
double sec = ((double)used_delay) / ((double)normal_delay);
int msec = 1000 * sec;
char buf[2048];
bool first;
bool updated;
torture_comment(tctx, "\nRunning test_delayed_write_update1a\n");
@ -336,6 +338,8 @@ static bool test_delayed_write_update1a(struct torture_context *tctx, struct smb
start = timeval_current();
end = timeval_add(&start, (120*sec), 0);
first = true;
updated = false;
while (!timeval_expired(&end)) {
status = smb_raw_fileinfo(cli->tree, tctx, &finfo2);
@ -347,32 +351,27 @@ static bool test_delayed_write_update1a(struct torture_context *tctx, struct smb
torture_comment(tctx, "write time %s\n",
nt_time_string(tctx, finfo2.all_info.out.write_time));
if (finfo1.all_info.out.write_time != finfo2.all_info.out.write_time) {
double diff = timeval_elapsed(&start);
if (diff > (0.25 * (used_delay / (double)1000000))) {
torture_result(tctx, TORTURE_FAIL, "After SMBwrite truncate "
"server updated write_time after %.2f seconds"
"(write time update delay == %.2f)(wrong!)\n",
diff, used_delay / (double)1000000);
ret = false;
break;
}
torture_comment(tctx, "After SMBwrite truncate "
"server updated write_time after %.2f seconds"
"(write time update delay == %.2f)(correct)\n",
diff, used_delay / (double)1000000);
if (finfo1.all_info.out.write_time !=
finfo2.all_info.out.write_time)
{
updated = true;
break;
}
fflush(stdout);
smb_msleep(1 * msec);
first = false;
}
torture_assert_u64_not_equal(tctx,
finfo1.all_info.out.write_time,
finfo2.all_info.out.write_time,
"Server did not update write time.");
torture_assert(tctx, updated,
"Server did not update write time within 120 seconds");
torture_assert(tctx, first, talloc_asprintf(tctx,
"Server did not update write time immediately but only "
"after %.2f seconds!", timeval_elapsed(&start)));
torture_comment(tctx, "Server updated write time immediately. Good!\n");
fflush(stdout);
smb_msleep(2 * msec);