summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-09-10 20:25:19 +0200
committerBjörn Jacke <bj@sernet.de>2010-09-10 23:10:25 +0200
commit478ac36b9c4b655c013846ae5ec02c56cbc626d7 (patch)
tree08ff8c85241499ef4436de2b921a31fc3449e359 /source4
parentd4d34bddd7e8105124f0bfab810f51bd1b1ce76d (diff)
downloadsamba-478ac36b9c4b655c013846ae5ec02c56cbc626d7.tar.gz
samba-478ac36b9c4b655c013846ae5ec02c56cbc626d7.tar.bz2
samba-478ac36b9c4b655c013846ae5ec02c56cbc626d7.zip
s4/torture: use time_mono for delta time
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/basic/locking.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index cece543fdd..71364ef578 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -106,14 +106,14 @@ static bool torture_locktest1(struct torture_context *tctx,
lock_timeout = (6 + (random() % 20));
torture_comment(tctx, "Testing lock timeout with timeout=%u\n",
lock_timeout);
- t1 = time(NULL);
+ t1 = time_mono(NULL);
torture_assert(tctx,
!NT_STATUS_IS_OK(smbcli_lock(cli2->tree, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)),
"lock3 succeeded! This is a locking bug\n");
if (!check_error(__location__, cli2, ERRDOS, ERRlock,
NT_STATUS_FILE_LOCK_CONFLICT)) return false;
- t2 = time(NULL);
+ t2 = time_mono(NULL);
if (t2 - t1 < 5) {
torture_fail(tctx,