Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd13b2c6 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Demoting a couple of flaking tests from presubmit" into main

parents a3f581d7 e494c1b6

quickstep/tests/src/com/android/quickstep/TaplOverviewIconTest.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.quickstep;



import static com.android.launcher3.ui.TaplTestsLauncher3.initialize;

import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;



import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;
@@ -25,6 +27,7 @@ import android.platform.test.annotations.PlatinumTest; 


import com.android.launcher3.tapl.OverviewTaskMenu;

import com.android.launcher3.ui.AbstractLauncherUiTest;

import com.android.launcher3.util.rule.TestStabilityRule;



import org.junit.Before;

import org.junit.Test;
@@ -72,6 +75,7 @@ public class TaplOverviewIconTest extends AbstractLauncherUiTest { 
    }



    @Test

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/288939273

    public void testSplitTaskTapBothIconMenus() {

        createAndLaunchASplitPair();

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.quickstep;



import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;

import static com.android.quickstep.TaskbarModeSwitchRule.Mode.PERSISTENT;

import static com.android.quickstep.TaskbarModeSwitchRule.Mode.TRANSIENT;
@@ -46,6 +48,7 @@ import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; 
import com.android.launcher3.ui.TaplTestsLauncher3;

import com.android.launcher3.util.Wait;

import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

import com.android.launcher3.util.rule.TestStabilityRule;

import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;

import com.android.quickstep.TaskbarModeSwitchRule.TaskbarModeSwitch;

import com.android.quickstep.views.RecentsView;
@@ -355,7 +358,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @PortraitLandscape

    @TaskbarModeSwitch(mode = PERSISTENT)

    @PlatinumTest(focusArea = "launcher")

    @ScreenRecord

    @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) // b/309820115

    public void testOverviewForTablet() throws Exception {

        assumeTrue(mLauncher.isTablet());