commit 5871c5b1e363279a864222f25829795ac12d4136
author Wale Ogunwale <ogunwale@google.com> Thu Feb 21 15:56:14 2019 -0800
committer Wale Ogunwale <ogunwale@google.com> Thu Feb 21 15:56:14 2019 -0800
tree 693c8e12f2994b87799768757074fc57228986ff
parent d76ec6e822fc317e12620694d8bcb6be2167115f

Moved no longer flaky WM CTS tests to pre-submit

Bug: 123654474
Bug: 121122996
Bug: 109874623
Bug: 77652261
Fixes: 122118854
Bug: 80380150
Bug: 112055644
Bug: 77207453
Bug: 118708868
Bug: 120748674
Fixes: 73701185
Fixes: 73812451
Bug: 71875631
Test: self
Change-Id: Ided2160a2705913ab6ad89b9ff099889098fb0a1

tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java

diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
index 29449c8..a02023e 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
@@ -78,6 +78,7 @@
  * Build/Install/Run:
  * atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests
  */
+@Presubmit
 public class ActivityMetricsLoggerTests extends ActivityManagerTestBase {
     private static final String TAG_ATM = "ActivityTaskManager";
     private final MetricsReader mMetricsReader = new MetricsReader();
@@ -100,7 +101,6 @@
      * In all three cases, verify the delay measurements are the same.
      */
     @Test
-    @Presubmit
     public void testAppLaunchIsLogged() {
         getLaunchActivityBuilder()
                 .setUseInstrumentation()
@@ -179,7 +179,6 @@
      * See {@link Activity#reportFullyDrawn()}
      */
     @Test
-    @Presubmit
     public void testAppFullyDrawnReportIsLogged() {
         getLaunchActivityBuilder()
                 .setUseInstrumentation()
@@ -215,8 +214,6 @@
      * metrics logs. Verify we output the correct launch state.
      */
     @Test
-    @Presubmit
-    @FlakyTest(bugId = 122118854)
     public void testAppWarmLaunchSetsWaitResultDelayData() {
         SystemUtil.runShellCommand("am start -S -W " + TEST_ACTIVITY.flattenToShortString());
 
@@ -253,8 +250,6 @@
      * metrics logs. Verify we output the correct launch state.
      */
     @Test
-    @Presubmit
-    @FlakyTest(bugId = 122118854)
     public void testAppHotLaunchSetsWaitResultDelayData() {
         SystemUtil.runShellCommand("am start -S -W " + TEST_ACTIVITY.flattenToShortString());
 
@@ -291,7 +286,6 @@
      * metrics logs. Verify we output the correct launch state.
      */
     @Test
-    @Presubmit
     public void testAppColdLaunchSetsWaitResultDelayData() {
         final String amStartOutput = SystemUtil.runShellCommand(
                 "am start -S -W " + TEST_ACTIVITY.flattenToShortString());
@@ -320,7 +314,6 @@
      * see b/117148004
      */
     @Test
-    @Presubmit
     public void testLaunchOfVisibleApp() {
         // Launch an activity.
         getLaunchActivityBuilder()
@@ -371,8 +364,6 @@
      * trampoline activity. See b/80380150 (Long warm launch times reported in dev play console)
      */
     @Test
-    @Presubmit
-    @FlakyTest(bugId = 80380150)
     public void testNoDisplayActivityLaunch() {
         getLaunchActivityBuilder()
                 .setUseInstrumentation()
@@ -398,7 +389,6 @@
      * draws on screen.
      */
     @Test
-    @Presubmit
     public void testTrampolineActivityLaunch() {
         // Launch a trampoline activity that will launch single task activity.
         getLaunchActivityBuilder()