diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-28 10:33:54 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-28 10:33:54 +1100 |
commit | b33873ae5d13993030f41f5304d78640fe07d25c (patch) | |
tree | b4d6dfd9833b603b16474b0d5ab7918474c7a8bd /source4/torture/basic/base.c | |
parent | 17207133ea446670e2123b510a593456928882fb (diff) | |
parent | 6dec6fbfaddf74c4567e83b354590cfbe3d6d0a9 (diff) | |
download | samba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.gz samba-b33873ae5d13993030f41f5304d78640fe07d25c.tar.bz2 samba-b33873ae5d13993030f41f5304d78640fe07d25c.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit ba864cfd7ce4b69179431131cac9661cbf48bf32)
Diffstat (limited to 'source4/torture/basic/base.c')
-rw-r--r-- | source4/torture/basic/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 42d7ddaaa1..66f9359744 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -664,7 +664,7 @@ static bool run_deferopen(struct torture_context *tctx, struct smbcli_state *cli } if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)) { double e = timeval_elapsed(&tv); - if (e < (0.5 * sec) || e > (1.5 * sec)) { + if (e < (0.5 * sec) || e > ((1.5 * sec) + 1)) { torture_comment(tctx,"Timing incorrect %.2f violation 1 sec == %.2f\n", e, sec); return false; |