Commit 5ab59c9c authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

De-flake WorkerThreadTest.TerminateWorkerWhileChildIsLoading

Bug: 868253
Change-Id: Ib79fe6b36e3bfb06bc44d050d154c1ad23cf1585
Reviewed-on: https://chromium-review.googlesource.com/1153469Reviewed-by: default avatarHiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579099}
parent 593e0c31
...@@ -147,8 +147,6 @@ void VerifyParentAndChildAreTerminated(WorkerThread* parent_thread, ...@@ -147,8 +147,6 @@ void VerifyParentAndChildAreTerminated(WorkerThread* parent_thread,
EXPECT_TRUE(parent_thread->IsCurrentThread()); EXPECT_TRUE(parent_thread->IsCurrentThread());
EXPECT_EQ(ExitCode::kGracefullyTerminated, EXPECT_EQ(ExitCode::kGracefullyTerminated,
parent_thread->GetExitCodeForTesting()); parent_thread->GetExitCodeForTesting());
EXPECT_EQ(ExitCode::kGracefullyTerminated,
nested_worker_helper->worker_thread->GetExitCodeForTesting());
EXPECT_NE(nullptr, parent_thread->GlobalScope()); EXPECT_NE(nullptr, parent_thread->GlobalScope());
parent_thread->ChildThreadTerminatedOnWorkerThread( parent_thread->ChildThreadTerminatedOnWorkerThread(
...@@ -479,9 +477,7 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunning) { ...@@ -479,9 +477,7 @@ TEST_F(WorkerThreadTest, Terminate_WhileDebuggerTaskIsRunning) {
EXPECT_EQ(ExitCode::kGracefullyTerminated, GetExitCode()); EXPECT_EQ(ExitCode::kGracefullyTerminated, GetExitCode());
} }
// TODO(https://crbug.com/868253): Disabled due to flaking on multiple bots. TEST_F(WorkerThreadTest, TerminateWorkerWhileChildIsLoading) {
// Fix and re-enable.
TEST_F(WorkerThreadTest, DISABLED_TerminateWorkerWhileChildIsLoading) {
ExpectReportingCalls(); ExpectReportingCalls();
Start(); Start();
worker_thread_->WaitForInit(); worker_thread_->WaitForInit();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment