Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo

Browse Source
This commit is contained in:
Yu Shan Emily Lau
2010-04-09 16:41:37 -07:00
committed by Android (Google) Code Review
parent 4525c98114 42349d03bf
commit 15b02f04c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
View File

@@ -439,7 +439,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@MediumTest @MediumTest
public void testPrepareAsyncReset() throws Exception { public void testPrepareAsyncReset() throws Exception {
assertTrue(MediaFrameworkTest.checkStreamingServer()); //assertTrue(MediaFrameworkTest.checkStreamingServer());
boolean isReset = CodecTest.prepareAsyncReset(MediaNames.STREAM_MP3); boolean isReset = CodecTest.prepareAsyncReset(MediaNames.STREAM_MP3);
assertTrue("PrepareAsync Reset", isReset); assertTrue("PrepareAsync Reset", isReset);
} }
@@ -472,7 +472,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@LargeTest @LargeTest
public void testStreamPrepareAsyncCallback() throws Exception { public void testStreamPrepareAsyncCallback() throws Exception {
assertTrue(MediaFrameworkTest.checkStreamingServer()); //assertTrue(MediaFrameworkTest.checkStreamingServer());
boolean onPrepareSuccess = boolean onPrepareSuccess =
CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, false); CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, false);
assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess); assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);
@@ -480,7 +480,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@LargeTest @LargeTest
public void testStreamPrepareAsyncCallbackReset() throws Exception { public void testStreamPrepareAsyncCallbackReset() throws Exception {
assertTrue(MediaFrameworkTest.checkStreamingServer()); //assertTrue(MediaFrameworkTest.checkStreamingServer());
boolean onPrepareSuccess = boolean onPrepareSuccess =
CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, true); CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, true);
assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess); assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);