diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 15:14:57 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-31 17:36:43 +0000 |
| commit | 2503a877f21838e66e873f839a5b6fd0c38abfab (patch) | |
| tree | 966ae9d7757aa58e7bff4aaa4b9b45b5f6668329 /vespalib/src/tests/rendezvous | |
| parent | 5ac0d0b71749c7555167c3c3906ff6843bf178f0 (diff) | |
Use vespalib::duration for timeouts
Diffstat (limited to 'vespalib/src/tests/rendezvous')
| -rw-r--r-- | vespalib/src/tests/rendezvous/rendezvous_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vespalib/src/tests/rendezvous/rendezvous_test.cpp b/vespalib/src/tests/rendezvous/rendezvous_test.cpp index f4ec7870ad5..6a3e87563ed 100644 --- a/vespalib/src/tests/rendezvous/rendezvous_test.cpp +++ b/vespalib/src/tests/rendezvous/rendezvous_test.cpp @@ -149,13 +149,13 @@ TEST_MT_FFFF("require that mingle is not called until all threads are present", for (bool ext_id: {false, true}) { CountDownLatch &latch = ext_id ? f4 : f2; if (thread_id == 0) { - EXPECT_FALSE(latch.await(20)); + EXPECT_FALSE(latch.await(20ms)); if (ext_id) { EXPECT_EQUAL(3u, f3.rendezvous(thread_id, thread_id).first); } else { EXPECT_EQUAL(3u, f1.rendezvous(thread_id).first); } - EXPECT_TRUE(latch.await(25000)); + EXPECT_TRUE(latch.await(25s)); } else { if (ext_id) { EXPECT_EQUAL(3u, f3.rendezvous(thread_id, thread_id).first); @@ -183,7 +183,7 @@ TEST_MT_FF("require that rendezvous can be run with additional threads", 100, Ad EXPECT_EQUAL(4950u, f1.rendezvous(res.first).first); f2.countDown(); } - EXPECT_TRUE(f2.await(25000)); + EXPECT_TRUE(f2.await(25s)); } TEST_MT_FF("require that mingle can modify its own copy of input values", 10, Modify<false>(num_threads), Modify<true>(num_threads)) { |