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

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

Browse Source 
Merge commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp

* commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
This commit is contained in:
Yu Shan Emily Lau
2010-04-10 11:41:58 -07:00
committed by Android Git Automerger
parent 376722fcdf 15b02f04c7
commit 6e40664fc7
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);