diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 13:07:55 +0100 |
| commit | a999a1fc996234555bd2d8a4a873b39d111c347e (patch) | |
| tree | 737b0bf68f6a93d6e835676b96b8bb3c606d1c91 /source4/torture | |
| parent | 227df641f680d844c85ea0ed1694e41ed355e262 (diff) | |
| parent | 901addd4a18a9a166fc3518a7bce70969f884e6f (diff) | |
| download | samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.gz samba-a999a1fc996234555bd2d8a4a873b39d111c347e.tar.bz2 samba-a999a1fc996234555bd2d8a4a873b39d111c347e.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)
Diffstat (limited to 'source4/torture')
| -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; |