WebUI: Disable WebUI JS/HTML tests on Linux CFI bots.

Bug: 1008122
Fixed: 1063739, 1064966, 1013656, 1031960, 1063723, 929288
Change-Id: I570b26be4acba3d73dc9e181ed1349efb35ef9b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2122458Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753816}

chrome/test/data/webui/BUILD.gn

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/sanitizers/sanitizers.gni")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//ui/webui/resources/tools/js_modulizer.gni")
@@ -312,11 +311,6 @@ js2gtest("browser_tests_js_webui") {
     ]
   }
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
-
-  # https://crbug.com/1013656
-  if (is_cfi) {
-    defines += [ "IS_CFI" ]
-  }
 }
 
 js2gtest("browser_tests_js_mojo_lite_webui") {

chrome/test/data/webui/cr_elements/cr_elements_browsertest.js

@@ -122,14 +122,7 @@ CrElementsDrawerTest.prototype = {
   ]),
 };
 
-// https://crbug.com/1013656 - Flaky on Linux CFI.
-GEN('#if defined(OS_LINUX) && defined(IS_CFI)');
-GEN('#define MAYBE_Drawer DISABLED_Drawer');
-GEN('#else');
-GEN('#define MAYBE_Drawer Drawer');
-GEN('#endif');
-
-TEST_F('CrElementsDrawerTest', 'MAYBE_Drawer', function() {
+TEST_F('CrElementsDrawerTest', 'Drawer', function() {
   mocha.run();
 });
 

chrome/test/data/webui/cr_elements/cr_elements_v3_browsertest.js

@@ -76,8 +76,8 @@ var CrElementsDrawerV3Test = class extends CrElementsV3BrowserTest {
   }
 };
 
-// https://crbug.com/1008122 - Flaky on Linux CFI and Mac 10.10.
-GEN('#if (defined(OS_LINUX) && defined(IS_CFI)) || defined(OS_MACOSX)');
+// https://crbug.com/1008122 - Flaky on Mac 10.10.
+GEN('#if defined(OS_MACOSX)');
 GEN('#define MAYBE_Drawer DISABLED_Drawer');
 GEN('#else');
 GEN('#define MAYBE_Drawer Drawer');

chrome/test/data/webui/settings/a11y/edit_dictionary_a11y_test.js

@@ -46,14 +46,6 @@ AccessibilityTest.define('EditDictionaryA11yTest', {
   /** @override */
   name: 'EDIT_DICTIONARY',
 
-  /** @override */
-  axeOptions: Object.assign({}, SettingsAccessibilityTest.axeOptions, {
-    'rules': Object.assign({}, SettingsAccessibilityTest.axeOptions.rules, {
-      // TODO(crbug.com/1012370): Disable because of timeout in CFI build.
-      'hidden-content': {enabled: false},
-    }),
-  }),
-
   /** @type {settings.FakeLanguageSettingsPrivate} */
   languageSettingsPrivate_: null,
 

chrome/test/data/webui/settings/a11y/passwords_a11y_test.js

@@ -37,20 +37,7 @@ AccessibilityTest.define('SettingsA11yPasswords', {
   passwordManager: null,
   /** @type {PasswordsSectionElement}*/
   passwordsSection: null,
-  // TODO(hcarmona): Create function that overrides defaults to simplify this.
-  axeOptions: Object.assign({}, SettingsAccessibilityTest.axeOptions, {
-    'rules': Object.assign({}, SettingsAccessibilityTest.axeOptions.rules, {
-      // TODO(hcarmona): Investigate flakyness and enable these tests.
-      // Disable rules flaky for CFI build.
-      'meta-viewport': {enabled: false},
-      'list': {enabled: false},
-      'frame-title': {enabled: false},
-      'label': {enabled: false},
-      'hidden-content': {enabled: false},
-      'aria-valid-attr-value': {enabled: false},
-      'button-name': {enabled: false},
-    }),
-  }),
+
   /** @override */
   setup: function() {
     return new Promise((resolve) => {

chrome/test/data/webui/settings/cr_settings_browsertest.js

@@ -370,17 +370,9 @@ CrSettingsPasswordsSectionTest.prototype = {
   ]),
 };
 
-// Flakily times out on Linux CFI.
-// TODO(crbug.com/1063723): Fix this by splitting up the test suite.
-GEN('#if defined(OS_LINUX) && defined(IS_CFI)');
-GEN('#define MAYBE_All DISABLED_All');
-GEN('#else');
-GEN('#define MAYBE_All All');
-GEN('#endif');
-TEST_F('CrSettingsPasswordsSectionTest', 'MAYBE_All', function() {
+TEST_F('CrSettingsPasswordsSectionTest', 'All', function() {
   mocha.run();
 });
-GEN('#undef MAYBE_All');
 
 /**
  * Test fixture for
@@ -1478,8 +1470,7 @@ CrSettingsSiteDetailsTest.prototype = {
 
 // Disabling on debug due to flaky timeout on Win7 Tests (dbg)(1) bot.
 // https://crbug.com/825304 - later for other platforms in crbug.com/1021219.
-// Disabling on Linux CFI due to flaky timeout (crbug.com/1031960).
-GEN('#if (!defined(NDEBUG)) || (defined(OS_LINUX) && defined(IS_CFI))');
+GEN('#if !defined(NDEBUG)');
 GEN('#define MAYBE_All DISABLED_All');
 GEN('#else');
 GEN('#define MAYBE_All All');
@@ -1488,6 +1479,8 @@ GEN('#endif');
 TEST_F('CrSettingsSiteDetailsTest', 'MAYBE_All', function() {
   mocha.run();
 });
+GEN('#undef MAYBE_All');
+
 
 /**
  * Test fixture for
@@ -2102,8 +2095,7 @@ CrSettingsMainPageTest.prototype = {
 
 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
 // Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
-// Times out on Linux CFI. See http://crbug.com/929288.
-GEN('#if !defined(NDEBUG) || (defined(OS_LINUX) && defined(IS_CFI))');
+GEN('#if !defined(NDEBUG)');
 GEN('#define MAYBE_MainPage DISABLED_MainPage');
 GEN('#else');
 GEN('#define MAYBE_MainPage MainPage');

chrome/test/data/webui/settings/cr_settings_interactive_ui_tests.js

@@ -132,8 +132,8 @@ SettingsUIInteractiveTest.prototype = {
   ]),
 };
 
-// Fails on Linux CFI and Mac10.13 Tests (dbg) (see crbug/1063844).
-GEN('#if !(defined(OS_LINUX) && defined(IS_CFI)) && !(defined(OS_MACOSX) && !defined(NDEBUG))');
+// Fails on Mac10.13 Tests (dbg) (see crbug/1063844).
+GEN('#if !(defined(OS_MACOSX) && !defined(NDEBUG))');
 TEST_F('SettingsUIInteractiveTest', 'All', function() {
   mocha.run();
 });

chrome/test/data/webui/settings/cr_settings_v3_browsertest.js

@@ -116,8 +116,7 @@ var CrSettingsMainPageV3Test = class extends CrSettingsV3BrowserTest {
 // Copied from Polymer 2 version of tests:
 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
 // Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
-// Times out on Linux CFI. See http://crbug.com/929288.
-GEN('#if !defined(NDEBUG) || (defined(OS_LINUX) && defined(IS_CFI))');
+GEN('#if !defined(NDEBUG)');
 GEN('#define MAYBE_MainPageV3 DISABLED_MainPageV3');
 GEN('#else');
 GEN('#define MAYBE_MainPageV3 MainPageV3');

chrome/test/include_js_tests.gni

@@ -3,5 +3,5 @@ import("//build/config/sanitizers/sanitizers.gni")
 if (!is_android) {
   # js_tests don't work in cross builds, https://crbug.com/1010561
   include_js_tests =
-      !(is_asan || is_msan || is_tsan || (is_win && host_os != "win"))
+      !(is_asan || is_msan || is_tsan || is_cfi || (is_win && host_os != "win"))
 }