azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Fix a race in ThreadWithContextTest

Browse Source 
Merge-request: KT-MR-5349
Merged-by: Alexander Shabalin <Alexander.Shabalin@jetbrains.com>
This commit is contained in:
Alexander Shabalin
2021-12-24 18:49:26 +00:00
committed by Space
parent 3f8fff55cf
commit a6b5339980
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/main/cpp/SingleThreadExecutorTest.cpp
+2 -1
View File
@@ -64,7 +64,6 @@ TEST(ThreadWithContextTest, ContextThreadBound) {
EXPECT_CALL(function, Call()).WillOnce([&] { EXPECT_THAT(std::this_thread::get_id(), createdThread); }); EXPECT_CALL(function, Call()).WillOnce([&] { EXPECT_THAT(std::this_thread::get_id(), createdThread); });
auto thread = ::make_unique<ThreadWithContext<PinnedContext>>([] { return PinnedContext(); }, function.AsStdFunction()); auto thread = ::make_unique<ThreadWithContext<PinnedContext>>([] { return PinnedContext(); }, function.AsStdFunction());
thread->waitInitialized(); thread->waitInitialized();
testing::Mock::VerifyAndClearExpectations(&function);
testing::Mock::VerifyAndClearExpectations(&mocks.ctorMock); testing::Mock::VerifyAndClearExpectations(&mocks.ctorMock);
EXPECT_THAT(createdThread, thread->get_id()); EXPECT_THAT(createdThread, thread->get_id());
EXPECT_THAT(thread->context(), testing::Ref(*createdContext)); EXPECT_THAT(thread->context(), testing::Ref(*createdContext));
@@ -73,6 +72,8 @@ TEST(ThreadWithContextTest, ContextThreadBound) {
EXPECT_THAT(std::this_thread::get_id(), createdThread); EXPECT_THAT(std::this_thread::get_id(), createdThread);
}); });
thread.reset(); thread.reset();
// The function is expected to be called at some point between `waitInitialized` and the thread exit.
testing::Mock::VerifyAndClearExpectations(&function);
testing::Mock::VerifyAndClearExpectations(&mocks.dtorMock); testing::Mock::VerifyAndClearExpectations(&mocks.dtorMock);
} }