Commit 85cca6f2 authored by rbpotter's avatar rbpotter Committed by Commit Bot

Web UI: Disable interactive_ui_tests on Windows and enable elsewhere

Some interactive_ui_tests were disabled on all platforms, but are in
fact only flaky on Windows due to https://crbug.com/711256. Re-enable
these tests on other platforms. Other Web UI tests are still enabled
but continuing to flake on Windows for the same reason; disable these
tests on Windows also.

Bug: 711256, 945630
Change-Id: Ida4bf95839870aa56a1c0de6d5152e1097bc5e66
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546849Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646468}
parent e4cd27d4
...@@ -29,7 +29,13 @@ BookmarksFocusTest.prototype = { ...@@ -29,7 +29,13 @@ BookmarksFocusTest.prototype = {
]), ]),
}; };
TEST_F('BookmarksFocusTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('BookmarksFocusTest', 'MAYBE_All', function() {
suite('<bookmarks-folder-node>', function() { suite('<bookmarks-folder-node>', function() {
let rootNode; let rootNode;
let store; let store;
......
...@@ -34,7 +34,13 @@ CrElementsActionMenuTest.prototype = { ...@@ -34,7 +34,13 @@ CrElementsActionMenuTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsActionMenuTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsActionMenuTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -52,7 +58,13 @@ CrElementsProfileAvatarSelectorFocusTest.prototype = { ...@@ -52,7 +58,13 @@ CrElementsProfileAvatarSelectorFocusTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsProfileAvatarSelectorFocusTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsProfileAvatarSelectorFocusTest', 'MAYBE_All', function() {
cr_profile_avatar_selector.registerTests(); cr_profile_avatar_selector.registerTests();
mocha.grep(cr_profile_avatar_selector.TestNames.Focus).run(); mocha.grep(cr_profile_avatar_selector.TestNames.Focus).run();
}); });
...@@ -76,7 +88,13 @@ CrElementsToggleTest.prototype = { ...@@ -76,7 +88,13 @@ CrElementsToggleTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsToggleTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsToggleTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -100,7 +118,13 @@ CrElementsCheckboxTest.prototype = { ...@@ -100,7 +118,13 @@ CrElementsCheckboxTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsCheckboxTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsCheckboxTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -123,7 +147,13 @@ CrElementsInputTest.prototype = { ...@@ -123,7 +147,13 @@ CrElementsInputTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsInputTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsInputTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -146,7 +176,13 @@ CrElementsIconButtonFocusTest.prototype = { ...@@ -146,7 +176,13 @@ CrElementsIconButtonFocusTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsIconButtonFocusTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsIconButtonFocusTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -172,6 +208,12 @@ CrElementsExpandButtonTest.prototype = { ...@@ -172,6 +208,12 @@ CrElementsExpandButtonTest.prototype = {
]), ]),
}; };
TEST_F('CrElementsExpandButtonTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrElementsExpandButtonTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -37,6 +37,12 @@ CrFocusRowBehaviorTest.prototype = { ...@@ -37,6 +37,12 @@ CrFocusRowBehaviorTest.prototype = {
}, },
}; };
TEST_F('CrFocusRowBehaviorTest', 'FocusTest', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_FocusTest DISABLED_FocusTest');
GEN('#else');
GEN('#define MAYBE_FocusTest FocusTest');
GEN('#endif');
TEST_F('CrFocusRowBehaviorTest', 'MAYBE_FocusTest', function() {
mocha.run(); mocha.run();
}); });
...@@ -58,6 +58,12 @@ CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest { ...@@ -58,6 +58,12 @@ CrExtensionsOptionsPageTest = class extends CrExtensionsInteractiveUITest {
} }
}; };
TEST_F('CrExtensionsOptionsPageTest', 'DISABLED_All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrExtensionsOptionsPageTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -37,7 +37,13 @@ HistoryFocusTest.prototype = { ...@@ -37,7 +37,13 @@ HistoryFocusTest.prototype = {
}, },
}; };
TEST_F('HistoryFocusTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('HistoryFocusTest', 'MAYBE_All', function() {
suite('<history-toolbar>', function() { suite('<history-toolbar>', function() {
let app; let app;
let toolbar; let toolbar;
......
...@@ -56,9 +56,14 @@ PrintPreviewPrintHeaderInteractiveTest = ...@@ -56,9 +56,14 @@ PrintPreviewPrintHeaderInteractiveTest =
} }
}; };
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_FocusPrintOnReady DISABLED_FocusPrintOnReady');
GEN('#else');
GEN('#define MAYBE_FocusPrintOnReady FocusPrintOnReady');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewPrintHeaderInteractiveTest', 'DISABLED_FocusPrintOnReady', 'PrintPreviewPrintHeaderInteractiveTest', 'MAYBE_FocusPrintOnReady',
function() { function() {
this.runMochaTest( this.runMochaTest(
print_header_interactive_test.TestNames.FocusPrintOnReady); print_header_interactive_test.TestNames.FocusPrintOnReady);
...@@ -89,17 +94,27 @@ PrintPreviewDestinationDialogInteractiveTest = ...@@ -89,17 +94,27 @@ PrintPreviewDestinationDialogInteractiveTest =
} }
}; };
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_FocusSearchBox DISABLED_FocusSearchBox');
GEN('#else');
GEN('#define MAYBE_FocusSearchBox FocusSearchBox');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewDestinationDialogInteractiveTest', 'DISABLED_FocusSearchBox', 'PrintPreviewDestinationDialogInteractiveTest', 'MAYBE_FocusSearchBox',
function() { function() {
this.runMochaTest( this.runMochaTest(
destination_dialog_interactive_test.TestNames.FocusSearchBox); destination_dialog_interactive_test.TestNames.FocusSearchBox);
}); });
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_EscapeSearchBox DISABLED_EscapeSearchBox');
GEN('#else');
GEN('#define MAYBE_EscapeSearchBox EscapeSearchBox');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewDestinationDialogInteractiveTest', 'DISABLED_EscapeSearchBox', 'PrintPreviewDestinationDialogInteractiveTest', 'MAYBE_EscapeSearchBox',
function() { function() {
this.runMochaTest( this.runMochaTest(
destination_dialog_interactive_test.TestNames.EscapeSearchBox); destination_dialog_interactive_test.TestNames.EscapeSearchBox);
...@@ -126,22 +141,37 @@ PrintPreviewPagesSettingsTest = class extends PrintPreviewInteractiveUITest { ...@@ -126,22 +141,37 @@ PrintPreviewPagesSettingsTest = class extends PrintPreviewInteractiveUITest {
} }
}; };
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
TEST_F('PrintPreviewPagesSettingsTest', 'DISABLED_ClearInput', function() { GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_ClearInput DISABLED_ClearInput');
GEN('#else');
GEN('#define MAYBE_ClearInput ClearInput');
GEN('#endif');
TEST_F('PrintPreviewPagesSettingsTest', 'MAYBE_ClearInput', function() {
this.runMochaTest(pages_settings_test.TestNames.ClearInput); this.runMochaTest(pages_settings_test.TestNames.ClearInput);
}); });
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_InputNotDisabledOnValidityChange DISABLED_InputNotDisabledOnValidityChange');
GEN('#else');
GEN('#define MAYBE_InputNotDisabledOnValidityChange InputNotDisabledOnValidityChange');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewPagesSettingsTest', 'PrintPreviewPagesSettingsTest', 'MAYBE_InputNotDisabledOnValidityChange',
'DISABLED_InputNotDisabledOnValidityChange', function() { function() {
this.runMochaTest( this.runMochaTest(
pages_settings_test.TestNames.InputNotDisabledOnValidityChange); pages_settings_test.TestNames.InputNotDisabledOnValidityChange);
}); });
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_EnterOnInputTriggersPrint DISABLED_EnterOnInputTriggersPrint');
GEN('#else');
GEN('#define MAYBE_EnterOnInputTriggersPrint EnterOnInputTriggersPrint');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewPagesSettingsTest', 'DISABLED_EnterOnInputTriggersPrint', 'PrintPreviewPagesSettingsTest', 'MAYBE_EnterOnInputTriggersPrint',
function() { function() {
this.runMochaTest( this.runMochaTest(
pages_settings_test.TestNames.EnterOnInputTriggersPrint); pages_settings_test.TestNames.EnterOnInputTriggersPrint);
...@@ -169,10 +199,15 @@ PrintPreviewNumberSettingsSectionInteractiveTest = ...@@ -169,10 +199,15 @@ PrintPreviewNumberSettingsSectionInteractiveTest =
} }
}; };
// Disabled due to flakiness crbug.com/945630 // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_BlurResetsEmptyInput DISABLED_BlurResetsEmptyInput');
GEN('#else');
GEN('#define MAYBE_BlurResetsEmptyInput BlurResetsEmptyInput');
GEN('#endif');
TEST_F( TEST_F(
'PrintPreviewNumberSettingsSectionInteractiveTest', 'PrintPreviewNumberSettingsSectionInteractiveTest',
'DISABLED_BlurResetsEmptyInput', function() { 'MAYBE_BlurResetsEmptyInput', function() {
this.runMochaTest(number_settings_section_interactive_test.TestNames this.runMochaTest(number_settings_section_interactive_test.TestNames
.BlurResetsEmptyInput); .BlurResetsEmptyInput);
}); });
...@@ -57,7 +57,13 @@ CrSettingsSyncPageTest.prototype = { ...@@ -57,7 +57,13 @@ CrSettingsSyncPageTest.prototype = {
]), ]),
}; };
TEST_F('CrSettingsSyncPageTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrSettingsSyncPageTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -79,6 +85,12 @@ CrSettingsAnimatedPagesTest.prototype = { ...@@ -79,6 +85,12 @@ CrSettingsAnimatedPagesTest.prototype = {
]), ]),
}; };
TEST_F('CrSettingsAnimatedPagesTest', 'All', function() { // Web UI interactive tests are flaky on Win10, see https://crbug.com/711256
GEN('#if defined(OS_WIN)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
TEST_F('CrSettingsAnimatedPagesTest', 'MAYBE_All', function() {
mocha.run(); mocha.run();
}); });
...@@ -123,7 +123,6 @@ CrSettingsExtensionControlledIndicatorTest.* ...@@ -123,7 +123,6 @@ CrSettingsExtensionControlledIndicatorTest.*
CrSettingsFindShortcutBehavior.* CrSettingsFindShortcutBehavior.*
CrSettingsFingerprintListTest.* CrSettingsFingerprintListTest.*
CrSettingsFingerprintProgressArcTest.* CrSettingsFingerprintProgressArcTest.*
CrSettingsFocusRowBehavior.*
CrSettingsGoogleAssistantPageTest.* CrSettingsGoogleAssistantPageTest.*
CrSettingsImportDataDialogTest.* CrSettingsImportDataDialogTest.*
CrSettingsIncompatibleApplicationsPageTest.* CrSettingsIncompatibleApplicationsPageTest.*
......
...@@ -10,12 +10,14 @@ ...@@ -10,12 +10,14 @@
BookmarksFocusTest.All BookmarksFocusTest.All
CrElementsActionMenuTest.All CrElementsActionMenuTest.All
CrElementsCheckboxTest.All CrElementsCheckboxTest.All
CrElementsExpandButtonTest.All
CrElementsIconButtonFocusTest.All
CrElementsInputTest.All CrElementsInputTest.All
CrElementsProfileAvatarSelectorFocusTest.All CrElementsProfileAvatarSelectorFocusTest.All
CrElementsToggleTest.All CrElementsToggleTest.All
CrExtensionsOptionsPageTest.All CrExtensionsOptionsPageTest.All
CrFocusRowBehaviorTest.FocusTest
CrSettingsAnimatedPagesTest.All CrSettingsAnimatedPagesTest.All
CrSettingsFocusRowBehavior.FocusTest
CrSettingsSyncPageTest.All CrSettingsSyncPageTest.All
HistoryFocusTest.All HistoryFocusTest.All
PrintPreviewDestinationDialogInteractiveTest.* PrintPreviewDestinationDialogInteractiveTest.*
......
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