Commit d5b88d13 authored by Nate Fischer's avatar Nate Fischer Committed by Commit Bot

Android: completely disable testManualInitiationWithBarOpen

No change to logic. This completely disables
testManualInitiationWithBarOpen(). This was previously disabled for
M-only, but this is also flaking on P.

This removes filters in favor of the @DisabledTest annotation since it
appears the test itself is flaky, not just on emulators.

Tbr: dtrainor@chromium.org
Bug: 1036553, 1130712, 1127786
Test: out/Default/bin/run_chrome_public_test_apk -f TranslateCompactInfoBarTest.*
Change-Id: Ic588962d6625a310549d0183754b2d4d612f4643
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422706
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809120}
parent 8d0b5802
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package org.chromium.chrome.browser.translate; package org.chromium.chrome.browser.translate;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.os.Build.VERSION_CODES;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
...@@ -18,7 +17,7 @@ import org.junit.Test; ...@@ -18,7 +17,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
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.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.R; import org.chromium.chrome.R;
...@@ -77,6 +76,7 @@ public class TranslateCompactInfoBarTest { ...@@ -77,6 +76,7 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisabledTest(message = "https://crbug.com/1130712")
public void testTranslateCompactInfoBarAppears() throws TimeoutException { public void testTranslateCompactInfoBarAppears() throws TimeoutException {
mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE));
mListener.addInfoBarAnimationFinished("InfoBar not opened."); mListener.addInfoBarAnimationFinished("InfoBar not opened.");
...@@ -92,6 +92,7 @@ public class TranslateCompactInfoBarTest { ...@@ -92,6 +92,7 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisabledTest(message = "https://crbug.com/1130712")
public void testTranslateCompactInfoBarOverflowMenus() throws TimeoutException { public void testTranslateCompactInfoBarOverflowMenus() throws TimeoutException {
mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE));
mListener.addInfoBarAnimationFinished("InfoBar not opened."); mListener.addInfoBarAnimationFinished("InfoBar not opened.");
...@@ -114,6 +115,7 @@ public class TranslateCompactInfoBarTest { ...@@ -114,6 +115,7 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisabledTest(message = "https://crbug.com/1130712")
public void testTabMenuDismissedOnOrientationChange() throws Exception { public void testTabMenuDismissedOnOrientationChange() throws Exception {
mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE));
mListener.addInfoBarAnimationFinished("InfoBar not opened."); mListener.addInfoBarAnimationFinished("InfoBar not opened.");
...@@ -143,6 +145,7 @@ public class TranslateCompactInfoBarTest { ...@@ -143,6 +145,7 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisabledTest(message = "https://crbug.com/1130712")
public void testTranslateCompactInfoBarReopenOnTarget() throws TimeoutException { public void testTranslateCompactInfoBarReopenOnTarget() throws TimeoutException {
mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE));
mListener.addInfoBarAnimationFinished("InfoBar not opened."); mListener.addInfoBarAnimationFinished("InfoBar not opened.");
...@@ -177,11 +180,8 @@ public class TranslateCompactInfoBarTest { ...@@ -177,11 +180,8 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisableIf. @DisabledTest(message = "https://crbug.com/1130712")
Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N, public void testStartTranslateOnManualInitiation() throws TimeoutException {
message = "Consistently failing on Marshmallow https://crbug.com/1127786")
public void
testStartTranslateOnManualInitiation() throws TimeoutException {
// Load a page that won't trigger the translate recommendation. // Load a page that won't trigger the translate recommendation.
mActivityTestRule.loadUrl(mTestServer.getURL(NON_TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(NON_TRANSLATE_PAGE));
...@@ -207,11 +207,8 @@ public class TranslateCompactInfoBarTest { ...@@ -207,11 +207,8 @@ public class TranslateCompactInfoBarTest {
@MediumTest @MediumTest
@Feature({"Browser", "Main"}) @Feature({"Browser", "Main"})
@Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES) @Restriction(ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
@DisableIf. @DisabledTest(message = "https://crbug.com/1130712")
Build(sdk_is_greater_than = VERSION_CODES.LOLLIPOP_MR1, sdk_is_less_than = VERSION_CODES.N, public void testManualInitiationWithBarOpen() throws TimeoutException {
message = "Consistently failing on Marshmallow https://crbug.com/1127786")
public void
testManualInitiationWithBarOpen() throws TimeoutException {
mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE)); mActivityTestRule.loadUrl(mTestServer.getURL(TRANSLATE_PAGE));
mListener.addInfoBarAnimationFinished("InfoBar not opened."); mListener.addInfoBarAnimationFinished("InfoBar not opened.");
......
...@@ -42,12 +42,6 @@ ...@@ -42,12 +42,6 @@
# crbug.com/1061214 # crbug.com/1061214
-org.chromium.chrome.browser.customtabs.CustomTabActivityTest.testHiddenTabAndChangingFragmentDontWait -org.chromium.chrome.browser.customtabs.CustomTabActivityTest.testHiddenTabAndChangingFragmentDontWait
# crbug.com/1036553
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTabMenuDismissedOnOrientationChange
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarAppears
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarOverflowMenus
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarReopenOnTarget
# crbug.com/1041233 # crbug.com/1041233
-org.chromium.chrome.browser.gesturenav.NavigationHandlerTest.testSwipeNavigateOnNativePage -org.chromium.chrome.browser.gesturenav.NavigationHandlerTest.testSwipeNavigateOnNativePage
-org.chromium.chrome.browser.gesturenav.NavigationHandlerTest.testSwipeNavigateOnRenderedPage -org.chromium.chrome.browser.gesturenav.NavigationHandlerTest.testSwipeNavigateOnRenderedPage
......
...@@ -24,12 +24,6 @@ ...@@ -24,12 +24,6 @@
# crbug/1040088 # crbug/1040088
-org.chromium.chrome.browser.payments.PaymentRequestRetryTest.testRetryWithShippingAddressErrorsAndPayerErrors -org.chromium.chrome.browser.payments.PaymentRequestRetryTest.testRetryWithShippingAddressErrorsAndPayerErrors
# crbug/1036553
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTabMenuDismissedOnOrientationChange
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarAppears
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarOverflowMenus
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarReopenOnTarget
# crbug.com/1059168 # crbug.com/1059168
-org.chromium.chrome.browser.autofill_assistant.AutofillAssistantBottomsheetTest.testNoResize -org.chromium.chrome.browser.autofill_assistant.AutofillAssistantBottomsheetTest.testNoResize
-org.chromium.chrome.browser.autofill_assistant.AutofillAssistantBottomsheetTest.testResizeLayoutViewport -org.chromium.chrome.browser.autofill_assistant.AutofillAssistantBottomsheetTest.testResizeLayoutViewport
......
...@@ -41,12 +41,6 @@ ...@@ -41,12 +41,6 @@
-org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInFadeOut -org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInFadeOut
-org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInZoomOut -org.chromium.chrome.browser.tasks.tab_management.TabGridDialogViewTest.testDialog_ZoomInZoomOut
# crbug.com/1036553
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTabMenuDismissedOnOrientationChange
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarAppears
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarOverflowMenus
-org.chromium.chrome.browser.translate.TranslateCompactInfoBarTest.testTranslateCompactInfoBarReopenOnTarget
# crbug.com/1036556 # crbug.com/1036556
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMediaSuspension -org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMediaSuspension
-org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMultiWindow -org.chromium.chrome.browser.usage_stats.TabSuspensionTest.testMultiWindow
......
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