commit db78674a987adf11c07978dee5755828b5e99bf3
author Brian Muramatsu <btmura@google.com> Mon Jun 04 13:11:09 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 13:11:09 2012 -0700
tree f592a80d3d799d2af587220bdc1228d33b4c052e
parent 0dbe847037fc266152965a6ca3d4645036f9ef2e
parent bdc0b2c1709c632b9374d37a91456161b98ceaa3

Merge changes I229d25a7,I1bde4c60 into jb-dev

* changes:
  Fix BasicAdapterTest flakiness
  temporarily nuke RTSP tests until fixed DO NOT MERGE

tests/expectations/knownfailures.txt

diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 770b85c..5d14dd0 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -1,5 +1,26 @@
 [
   {
+    names: [
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_MPEG4SP_AAC_Video1",
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_MPEG4SP_AAC_Video2"
+    ],
+    bug: 6422606
+  },
+  {
+    names: [
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_H263_AMR_Video1",
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_H263_AMR_Video2"
+    ],
+    bug: 6216077
+  },
+  {
+    names: [
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_H264Base_AAC_Video1",
+      "android.media.cts.StreamingMediaPlayerTest#testRTSP_H264Base_AAC_Video2"
+    ],
+    bug: 6215719
+  },
+  {
     name: "android.opengl.cts.AttachShaderTest#test_glAttachedShaders_invalidshader",
     bug: 6404341
   },

tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java

diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index e64da89..1a8b3a8 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -31,8 +31,8 @@
  * BluetoothAdapter}.
  */
 public class BasicAdapterTest extends AndroidTestCase {
-    private static final int DISABLE_TIMEOUT = 5000;  // ms timeout for BT disable
-    private static final int ENABLE_TIMEOUT = 10000;  // ms timeout for BT enable
+    private static final int DISABLE_TIMEOUT = 20000; // ms timeout for BT disable
+    private static final int ENABLE_TIMEOUT = 20000;  // ms timeout for BT enable
     private static final int POLL_TIME = 400;         // ms to poll BT state
 
     private boolean mHasBluetooth;
@@ -227,12 +227,13 @@
             return;
         }
 
-        assertEquals(BluetoothAdapter.STATE_ON, adapter.getState());
-        assertTrue(adapter.isEnabled());
         adapter.disable();
         for (int i=0; i<DISABLE_TIMEOUT/POLL_TIME; i++) {
             sleep(POLL_TIME);
             switch (adapter.getState()) {
+            case BluetoothAdapter.STATE_ON:
+                assertTrue(adapter.isEnabled());
+                continue;
             case BluetoothAdapter.STATE_OFF:
                 assertFalse(adapter.isEnabled());
                 return;
@@ -255,12 +256,13 @@
             return;
         }
 
-        assertEquals(BluetoothAdapter.STATE_OFF, adapter.getState());
-        assertFalse(adapter.isEnabled());
         adapter.enable();
         for (int i=0; i<ENABLE_TIMEOUT/POLL_TIME; i++) {
             sleep(POLL_TIME);
             switch (adapter.getState()) {
+            case BluetoothAdapter.STATE_OFF:
+                assertFalse(adapter.isEnabled());
+                continue;
             case BluetoothAdapter.STATE_ON:
                 assertTrue(adapter.isEnabled());
                 return;