Commit c039aa88 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Flakiness fix attempt #2 for WMPI::Load() tests.

Use WillRepeatedly() instead of WillOnce().

BUG=831566
TBR=chcunningham

Change-Id: I2cebaebcfa5ff026c43d3c4a267f5d3653e91dae
Reviewed-on: https://chromium-review.googlesource.com/1012699Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550717}
parent c06acc70
...@@ -663,8 +663,11 @@ class WebMediaPlayerImplTest : public testing::Test { ...@@ -663,8 +663,11 @@ class WebMediaPlayerImplTest : public testing::Test {
blink::WebMediaPlayer::kReadyStateHaveCurrentData) { blink::WebMediaPlayer::kReadyStateHaveCurrentData) {
base::RunLoop loop; base::RunLoop loop;
EXPECT_CALL(client_, ReadyStateChanged()) EXPECT_CALL(client_, ReadyStateChanged())
.WillOnce(RunClosure(loop.QuitClosure())); .WillRepeatedly(RunClosure(loop.QuitClosure()));
loop.Run(); loop.Run();
// Clear the mock so it doesn't have a stale QuitClosure.
testing::Mock::VerifyAndClearExpectations(&client_);
} }
// Verify we made it through pipeline startup. // Verify we made it through pipeline startup.
...@@ -743,8 +746,7 @@ TEST_F(WebMediaPlayerImplTest, LoadAndDestroy) { ...@@ -743,8 +746,7 @@ TEST_F(WebMediaPlayerImplTest, LoadAndDestroy) {
} }
// Verify that preload=metadata suspend works properly. // Verify that preload=metadata suspend works properly.
// Crashes frequently on Linux TSan and MSan. https://crbug.com/831566 TEST_F(WebMediaPlayerImplTest, LoadPreloadMetadataSuspend) {
TEST_F(WebMediaPlayerImplTest, DISABLED_LoadPreloadMetadataSuspend) {
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndEnableFeature(media::kPreloadMetadataSuspend); scoped_feature_list.InitAndEnableFeature(media::kPreloadMetadataSuspend);
InitializeWebMediaPlayerImpl(); InitializeWebMediaPlayerImpl();
......
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