Merge "Change FlakyTest to Ignores" into oc-dr1-dev

am: 209705d5d7

Change-Id: I3e0ae84bf3b814b9a891c1909012c1fd4ae791ec

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

@@ -40,10 +40,12 @@ import com.android.systemui.utils.hardware.FakeSensorManager;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @SmallTest
+@Ignore("failing")
 @RunWith(AndroidJUnit4.class)
 public class DozeTriggersTest extends SysuiTestCase {
     private DozeTriggers mTriggers;
@@ -79,7 +81,6 @@ public class DozeTriggersTest extends SysuiTestCase {
         });
     }
 
-    @FlakyTest
     @Test
     public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
         when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);
@@ -109,4 +110,4 @@ public class DozeTriggersTest extends SysuiTestCase {
         verify(mMachine).requestPulse(anyInt());
     }
 
-}
+}

packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java

@@ -47,7 +47,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper
 @SmallTest
-@FlakyTest
+@Ignore("failing")
 public class QSDetailTest extends SysuiTestCase {
 
     private MetricsLogger mMetricsLogger;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java

@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper
 @SmallTest
-@FlakyTest
+@Ignore("failing")
 public class QSFooterTest extends LeakCheckedTest {
 
     private QSFooter mFooter;

packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java

@@ -52,7 +52,7 @@ import android.widget.FrameLayout;
 @RunWith(AndroidTestingRunner.class)
 @RunWithLooper(setAsMainLooper = true)
 @SmallTest
-@FlakyTest
+@Ignore("failing")
 public class QSFragmentTest extends SysuiBaseFragmentTest {
 
     private MetricsLogger mMockMetricsLogger;