Commit a5e4085f authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot

Reenable test with fix

fuchsia should no longer be racing and taking a page fault on IP.

Bug: 864018
Change-Id: I07a21cbc80944822ceb3dcc12cfc39f8978d677c
Reviewed-on: https://chromium-review.googlesource.com/1141353
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576344}
parent 880521f7
......@@ -1071,9 +1071,7 @@ TEST_F(PipelineIntegrationTest, PipelineStoppedWhileAudioRestartPending) {
Stop();
}
// Flaky crashes on multiple platforms. crbug.com/864018
TEST_F(PipelineIntegrationTest,
DISABLED_PipelineStoppedWhileVideoRestartPending) {
TEST_F(PipelineIntegrationTest, PipelineStoppedWhileVideoRestartPending) {
ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm"));
Play();
......
......@@ -400,7 +400,7 @@ void PipelineIntegrationTestBase::FailTest(PipelineStatus status) {
void PipelineIntegrationTestBase::QuitAfterCurrentTimeTask(
base::TimeDelta quit_time,
base::OnceClosure quit_closure) {
if (pipeline_->GetMediaTime() >= quit_time ||
if (!pipeline_ || pipeline_->GetMediaTime() >= quit_time ||
pipeline_status_ != PIPELINE_OK) {
std::move(quit_closure).Run();
return;
......
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