diff options
| author | Adam C. Emerson <aemerson@redhat.com> | 2016-11-15 01:33:56 +0100 |
|---|---|---|
| committer | Adam C. Emerson <aemerson@redhat.com> | 2016-12-22 19:55:37 +0100 |
| commit | 750ad8340c827d2f8896e1251e45f921dddb9f30 (patch) | |
| tree | 436f838c7eb7e3a6109a90202162e23540248af5 /src/test/cls_lock | |
| parent | Merge pull request #12616 from atheism/rgw-ldap-fix-simple-bind (diff) | |
| download | ceph-750ad8340c827d2f8896e1251e45f921dddb9f30.tar.xz ceph-750ad8340c827d2f8896e1251e45f921dddb9f30.zip | |
common: Unskew clock
In preparation to deglobalizing CephContext, remove the CephContext*
parameter to ceph_clock_now() and ceph::real_clock::now() that carries
a configurable offset.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Diffstat (limited to 'src/test/cls_lock')
| -rw-r--r-- | src/test/cls_lock/test_cls_lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/cls_lock/test_cls_lock.cc b/src/test/cls_lock/test_cls_lock.cc index 104081559e1..29dc0e04dda 100644 --- a/src/test/cls_lock/test_cls_lock.cc +++ b/src/test/cls_lock/test_cls_lock.cc @@ -283,12 +283,12 @@ TEST(ClsLock, TestLockDuration) { Lock l("lock"); utime_t dur(5, 0); l.set_duration(dur); - utime_t start = ceph_clock_now(NULL); + utime_t start = ceph_clock_now(); ASSERT_EQ(0, l.lock_exclusive(&ioctx, oid)); int r = l.lock_exclusive(&ioctx, oid); if (r == 0) { // it's possible to get success if we were just really slow... - ASSERT_TRUE(ceph_clock_now(NULL) > start + dur); + ASSERT_TRUE(ceph_clock_now() > start + dur); } else { ASSERT_EQ(-EEXIST, r); } |