diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 13:10:54 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 13:10:54 +0000 |
| commit | ba7280cf59a7e990f9626c5cfae5ea4e1b8e2761 (patch) | |
| tree | 2a5e2ec682e10a239aad9efc3ec64fef67242a6a /media | |
| parent | f8aa0c646f9eab18858b4d28c09c86217dc4d311 (diff) | |
| download | chromium_src-ba7280cf59a7e990f9626c5cfae5ea4e1b8e2761.zip chromium_src-ba7280cf59a7e990f9626c5cfae5ea4e1b8e2761.tar.gz chromium_src-ba7280cf59a7e990f9626c5cfae5ea4e1b8e2761.tar.bz2 | |
Reenable some tests after flakiness resolved
http://crbug.com/361541 should fixed the flakiness of these tests.
Review URL: https://codereview.chromium.org/236183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/media_source_player_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc index 9c6a062..a3e69e5b 100644 --- a/media/base/android/media_source_player_unittest.cc +++ b/media/base/android/media_source_player_unittest.cc @@ -1861,8 +1861,7 @@ TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenDemuxerSeekAndDone) { EXPECT_EQ(1, demuxer_->num_seek_requests()); } -TEST_F(MediaSourcePlayerTest, - DISABLED_SeekToThenReleaseThenDemuxerSeekThenStart) { +TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenDemuxerSeekThenStart) { SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE(); // Test if Release() occurs after SeekTo(), but the DemuxerSeek IPC request @@ -1890,8 +1889,7 @@ TEST_F(MediaSourcePlayerTest, EXPECT_EQ(1, demuxer_->num_seek_requests()); } -TEST_F(MediaSourcePlayerTest, - DISABLED_SeekToThenDemuxerSeekThenReleaseThenSeekDone) { +TEST_F(MediaSourcePlayerTest, SeekToThenDemuxerSeekThenReleaseThenSeekDone) { SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE(); // Test if Release() occurs after a SeekTo()'s subsequent DemuxerSeek IPC @@ -1918,8 +1916,7 @@ TEST_F(MediaSourcePlayerTest, EXPECT_EQ(1, demuxer_->num_seek_requests()); } -// Flaky. See http://crbug.com/361359. -TEST_F(MediaSourcePlayerTest, DISABLED_SeekToThenReleaseThenStart) { +TEST_F(MediaSourcePlayerTest, SeekToThenReleaseThenStart) { SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE(); // Test if Release() occurs after a SeekTo()'s subsequent DemuxerSeeK IPC |