Commit a1e402ac authored by Wei-Yin Chen (陳威尹)'s avatar Wei-Yin Chen (陳威尹) Committed by Commit Bot

Re-enable more stable tests in StartSurfaceTest

In crrev.com/c/2209302, the following tests were disabled because they
were flaky on Android M builders and P emulators:
- testShow_TasksOnly
- testShow_TwoPanes
- testScroll_OmniboxOnly_Pinned

They are re-enabled on builders like android-pie-arm64-rel.

Bug: 1081822, 1084176, 1083459
Change-Id: Ie7e2c833ce5e475cc954318a5afacc35c7e8f9fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315996Reviewed-by: default avatarYue Zhang <yuezhanggg@chromium.org>
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799019}
parent 6efc008c
...@@ -68,7 +68,6 @@ import org.chromium.base.test.params.ParameterSet; ...@@ -68,7 +68,6 @@ import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner; import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf; import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Restriction; import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.ChromeTabbedActivity;
...@@ -197,7 +196,8 @@ public class StartSurfaceTest { ...@@ -197,7 +196,8 @@ public class StartSurfaceTest {
@Test @Test
@MediumTest @MediumTest
@Feature({"StartSurface"}) @Feature({"StartSurface"})
@DisabledTest(message = "crbug.com/1084176") @DisableIf.Build(sdk_is_less_than = P, message = "crbug.com/1084176")
@DisableIf.Build(supported_abis_includes = "x86", message = "https://crbug.com/1084176")
@CommandLineFlags.Add({BASE_PARAMS + "/tasksonly"}) @CommandLineFlags.Add({BASE_PARAMS + "/tasksonly"})
public void testShow_TasksOnly() { public void testShow_TasksOnly() {
final ChromeTabbedActivity cta = mActivityTestRule.getActivity(); final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
...@@ -335,7 +335,8 @@ public class StartSurfaceTest { ...@@ -335,7 +335,8 @@ public class StartSurfaceTest {
@Test @Test
@MediumTest @MediumTest
@Feature({"StartSurface"}) @Feature({"StartSurface"})
@DisabledTest(message = "crbug.com/1081822") @DisableIf.Build(sdk_is_less_than = P, message = "crbug.com/1081822")
@DisableIf.Build(supported_abis_includes = "x86", message = "https://crbug.com/1081822")
@CommandLineFlags.Add({BASE_PARAMS + "/twopanes"}) @CommandLineFlags.Add({BASE_PARAMS + "/twopanes"})
public void testShow_TwoPanes() { public void testShow_TwoPanes() {
final ChromeTabbedActivity cta = mActivityTestRule.getActivity(); final ChromeTabbedActivity cta = mActivityTestRule.getActivity();
...@@ -918,7 +919,8 @@ public class StartSurfaceTest { ...@@ -918,7 +919,8 @@ public class StartSurfaceTest {
@MediumTest @MediumTest
@Feature({"StartSurface"}) @Feature({"StartSurface"})
// clang-format off // clang-format off
@DisabledTest(message = "crbug.com/1083459") @DisableIf.Build(sdk_is_less_than = P, message = "crbug.com/1083459")
@DisableIf.Build(supported_abis_includes = "x86", message = "https://crbug.com/1083459")
@CommandLineFlags.Add({BASE_PARAMS + "/omniboxonly" + @CommandLineFlags.Add({BASE_PARAMS + "/omniboxonly" +
"/hide_switch_when_no_incognito_tabs/true/omnibox_scroll_mode/pinned"}) "/hide_switch_when_no_incognito_tabs/true/omnibox_scroll_mode/pinned"})
public void testScroll_Pinned() { public void testScroll_Pinned() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment