mirror of
https://github.com/samba-team/samba.git
synced 2025-01-27 14:04:05 +03:00
fixed smbtorture LOCK1 test to know about the correct multiplier for
timed blocking locks (This used to be commit 24feb1afa621c4f93135f36e635af08abe8e7c24)
This commit is contained in:
parent
0d556758de
commit
7c6aee526a
@ -866,7 +866,7 @@ static BOOL run_locktest1(int dummy)
|
||||
lock_timeout = (1 + (random() % 20));
|
||||
printf("Testing lock timeout with timeout=%u\n", lock_timeout);
|
||||
t1 = time(NULL);
|
||||
if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
|
||||
if (cli_lock(cli2, fnum3, 0, 4, lock_timeout * 500, WRITE_LOCK)) {
|
||||
printf("lock3 succeeded! This is a locking bug\n");
|
||||
return False;
|
||||
} else {
|
||||
@ -875,9 +875,10 @@ static BOOL run_locktest1(int dummy)
|
||||
}
|
||||
t2 = time(NULL);
|
||||
|
||||
if (t2 - t1 < 5) {
|
||||
if (ABS(t2 - t1) < lock_timeout-1) {
|
||||
printf("error: This server appears not to support timed lock requests\n");
|
||||
}
|
||||
|
||||
printf("server slept for %u seconds for a %u second timeout\n",
|
||||
(unsigned int)(t2-t1), lock_timeout);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user