diff options
Diffstat (limited to 'vespalib/src/tests/barrier/barrier_test.cpp')
-rw-r--r-- | vespalib/src/tests/barrier/barrier_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vespalib/src/tests/barrier/barrier_test.cpp b/vespalib/src/tests/barrier/barrier_test.cpp index f829b7fa5d8..2340476d4e0 100644 --- a/vespalib/src/tests/barrier/barrier_test.cpp +++ b/vespalib/src/tests/barrier/barrier_test.cpp @@ -13,9 +13,9 @@ struct Fixture { TEST_MT_F("require that barriers are satisfied by the appropriate number of threads", 3, Fixture(num_threads)) { if (thread_id == 0) { f1.latch.countDown(); - EXPECT_FALSE(f.latch.await(250)); + EXPECT_FALSE(f.latch.await(250ms)); EXPECT_TRUE(f.barrier.await()); - EXPECT_TRUE(f.latch.await(25000)); + EXPECT_TRUE(f.latch.await(25s)); } else { EXPECT_TRUE(f1.barrier.await()); f1.latch.countDown(); @@ -27,9 +27,9 @@ TEST_MT_F("require that barriers can be used multiple times", 3, Fixture(num_thr EXPECT_TRUE(f1.barrier.await()); if (thread_id == 0) { f1.latch.countDown(); - EXPECT_FALSE(f.latch.await(250)); + EXPECT_FALSE(f.latch.await(250ms)); EXPECT_TRUE(f.barrier.await()); - EXPECT_TRUE(f.latch.await(25000)); + EXPECT_TRUE(f.latch.await(25s)); } else { EXPECT_TRUE(f1.barrier.await()); f1.latch.countDown(); @@ -40,9 +40,9 @@ TEST_MT_F("require that barriers can be broken", 3, Fixture(num_threads)) { EXPECT_TRUE(f1.barrier.await()); if (thread_id == 0) { f1.latch.countDown(); - EXPECT_FALSE(f.latch.await(250)); + EXPECT_FALSE(f.latch.await(250ms)); f1.barrier.destroy(); - EXPECT_TRUE(f.latch.await(25000)); + EXPECT_TRUE(f.latch.await(25s)); } else { EXPECT_FALSE(f1.barrier.await()); f1.latch.countDown(); |