summaryrefslogtreecommitdiff
path: root/src/caffe/test/test_internal_thread.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/caffe/test/test_internal_thread.cpp')
-rw-r--r--src/caffe/test/test_internal_thread.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/caffe/test/test_internal_thread.cpp b/src/caffe/test/test_internal_thread.cpp
index 390c8eda..93f1cc54 100644
--- a/src/caffe/test/test_internal_thread.cpp
+++ b/src/caffe/test/test_internal_thread.cpp
@@ -14,9 +14,9 @@ class InternalThreadTest : public ::testing::Test {};
TEST_F(InternalThreadTest, TestStartAndExit) {
InternalThread thread;
EXPECT_FALSE(thread.is_started());
- EXPECT_TRUE(thread.StartInternalThread());
+ thread.StartInternalThread();
EXPECT_TRUE(thread.is_started());
- EXPECT_TRUE(thread.WaitForInternalThreadToExit());
+ thread.StopInternalThread();
EXPECT_FALSE(thread.is_started());
}
@@ -35,18 +35,18 @@ class TestThreadB : public InternalThread {
TEST_F(InternalThreadTest, TestRandomSeed) {
TestThreadA t1;
Caffe::set_random_seed(9658361);
- EXPECT_TRUE(t1.StartInternalThread());
- EXPECT_TRUE(t1.WaitForInternalThreadToExit());
+ t1.StartInternalThread();
+ t1.StopInternalThread();
TestThreadA t2;
Caffe::set_random_seed(9658361);
- EXPECT_TRUE(t2.StartInternalThread());
- EXPECT_TRUE(t2.WaitForInternalThreadToExit());
+ t2.StartInternalThread();
+ t2.StopInternalThread();
TestThreadB t3;
Caffe::set_random_seed(3435563);
- EXPECT_TRUE(t3.StartInternalThread());
- EXPECT_TRUE(t3.WaitForInternalThreadToExit());
+ t3.StartInternalThread();
+ t3.StopInternalThread();
}
} // namespace caffe