Skip to content

GitLab

T
tangled
Commit 2228aa6d authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot
Browse files
Options

Speculatively re-enable many flaky tests to see if they're still flaky. 

Bug: 870861
Change-Id: I8f5f47a2f87256ea3edf764ad5acedc287566d8b
TBR: palmer
Reviewed-on: https://chromium-review.googlesource.com/1172074Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582468}
parent c772baa1
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 69 deletions
chrome/browser/ssl/ssl_browsertest.cc
View file @ 2228aa6d
......@@ -5801,13 +5801,7 @@ IN_PROC_BROWSER_TEST_P(SSLUITest, DISABLED_RestoreThenNavigateHasSSLState) {
// could happen when the user's login is expired and the server redirects them
// to a login page. This will be considered a same document navigation but we
// do want to update the SSL state.
#if defined(OS_WIN)
// flaky http://crbug.com/872332
#define MAYBE_SameDocumentHasSSLState DISABLED_SameDocumentHasSSLState
#else
#define MAYBE_SameDocumentHasSSLState SameDocumentHasSSLState
#endif
IN_PROC_BROWSER_TEST_P(SSLUITest, MAYBE_SameDocumentHasSSLState) {
IN_PROC_BROWSER_TEST_P(SSLUITest, SameDocumentHasSSLState) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
......
chrome/test/data/webui/extensions/cr_extensions_browsertest.js
View file @ 2228aa6d
......@@ -88,15 +88,11 @@ CrExtensionsSidebarTest = class extends CrExtensionsBrowserTest {
}
};
// Flaky, see https://crbug.com/871692 .
TEST_F(
'CrExtensionsSidebarTest', 'DISABLED_LayoutAndClickHandlers', function() {
this.runMochaTest(
extension_sidebar_tests.TestNames.LayoutAndClickHandlers);
});
TEST_F('CrExtensionsSidebarTest', 'LayoutAndClickHandlers', function() {
this.runMochaTest(extension_sidebar_tests.TestNames.LayoutAndClickHandlers);
});
// Flaky, see https://crbug.com/871692 .
TEST_F('CrExtensionsSidebarTest', 'DISABLED_SetSelected', function() {
TEST_F('CrExtensionsSidebarTest', 'SetSelected', function() {
this.runMochaTest(extension_sidebar_tests.TestNames.SetSelected);
});
......@@ -350,11 +346,9 @@ TEST_F('CrExtensionsManagerUnitTest', 'Uninstall', function() {
this.runMochaTest(extension_manager_tests.TestNames.Uninstall);
});
// Flaky, see https://crbug.com/871692 .
TEST_F(
'CrExtensionsManagerUnitTest', 'DISABLED_UninstallFromDetails', function() {
TEST_F('CrExtensionsManagerUnitTest', 'UninstallFromDetails', function() {
this.runMochaTest(extension_manager_tests.TestNames.UninstallFromDetails);
});
});
TEST_F('CrExtensionsManagerUnitTest', 'ToggleIncognito', function() {
this.runMochaTest(extension_manager_tests.TestNames.ToggleIncognitoMode);
......@@ -406,10 +400,9 @@ TEST_F(
this.runMochaTest(extension_manager_tests.TestNames.SplitItems);
});
// Flaky, see https://crbug.com/871692 .
TEST_F(
'CrExtensionsManagerTestWithMultipleExtensionTypesInstalled',
'DISABLED_ChangePages', function() {
'CrExtensionsManagerTestWithMultipleExtensionTypesInstalled', 'ChangePages',
function() {
this.runMochaTest(extension_manager_tests.TestNames.ChangePages);
});
......@@ -658,13 +651,10 @@ TEST_F('CrExtensionsNavigationHelperTest', 'Conversion', function() {
this.runMochaTest(extension_navigation_helper_tests.TestNames.Conversions);
});
// Flaky, see https://crbug.com/871692 .
TEST_F(
'CrExtensionsNavigationHelperTest', 'DISABLED_PushAndReplaceState',
function() {
TEST_F('CrExtensionsNavigationHelperTest', 'PushAndReplaceState', function() {
this.runMochaTest(
extension_navigation_helper_tests.TestNames.PushAndReplaceState);
});
});
TEST_F('CrExtensionsNavigationHelperTest', 'SupportedRoutes', function() {
this.runMochaTest(
......
chrome/test/data/webui/settings/a11y/passwords_a11y_test.js
View file @ 2228aa6d
......@@ -25,11 +25,7 @@ SettingsA11yManagePasswords.prototype = {
]),
};
// Disabled for flake. https://crbug.com/872575. The only way I could find to
// disable the test was to *not* call AccessibilityTest.define(), so this is
// commented out.
// AccessibilityTest.define('SettingsA11yManagePasswords', {
DISABLED_SettingsA11yManagePasswords = {
AccessibilityTest.define('SettingsA11yManagePasswords', {
/** @override */
name: 'MANAGE_PASSWORDS',
/** @type {PasswordManager} */
......@@ -108,4 +104,4 @@ DISABLED_SettingsA11yManagePasswords = {
/** @override */
violationFilter: SettingsAccessibilityTest.violationFilter,
} /*)*/;
});
chrome/test/data/webui/settings/cr_settings_browsertest.js
View file @ 2228aa6d
......@@ -499,8 +499,7 @@ CrSettingsPeoplePageTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsPeoplePageTest', 'DISABLED_All', function() {
TEST_F('CrSettingsPeoplePageTest', 'All', function() {
mocha.run();
});
......@@ -583,8 +582,7 @@ CrSettingsResetPageTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsResetPageTest', 'DISABLED_All', function() {
TEST_F('CrSettingsResetPageTest', 'All', function() {
mocha.run();
});
......@@ -987,8 +985,7 @@ CrSettingsCategoryDefaultSettingTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsCategoryDefaultSettingTest', 'DISABLED_All', function() {
TEST_F('CrSettingsCategoryDefaultSettingTest', 'All', function() {
mocha.run();
});
......@@ -1013,8 +1010,7 @@ CrSettingsCategorySettingExceptionsTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsCategorySettingExceptionsTest', 'DISABLED_All', function() {
TEST_F('CrSettingsCategorySettingExceptionsTest', 'All', function() {
mocha.run();
});
......@@ -1040,8 +1036,7 @@ CrSettingsSiteEntryTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsSiteEntryTest', 'DISABLED_All', function() {
TEST_F('CrSettingsSiteEntryTest', 'All', function() {
mocha.run();
});
......@@ -1102,8 +1097,7 @@ GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsSiteDetailsTest', 'DISABLED_All', function() {
TEST_F('CrSettingsSiteDetailsTest', 'MAYBE_All', function() {
mocha.run();
});
......@@ -1155,8 +1149,7 @@ CrSettingsSiteListTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsSiteListTest', 'DISABLED_SiteList', function() {
TEST_F('CrSettingsSiteListTest', 'SiteList', function() {
mocha.grep('SiteList').run();
});
......@@ -1164,8 +1157,7 @@ TEST_F('CrSettingsSiteListTest', 'EditExceptionDialog', function() {
mocha.grep('EditExceptionDialog').run();
});
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsSiteListTest', 'DISABLED_AddExceptionDialog', function() {
TEST_F('CrSettingsSiteListTest', 'AddExceptionDialog', function() {
mocha.grep('AddExceptionDialog').run();
});
......@@ -1518,8 +1510,7 @@ CrSettingsEditDictionaryPageTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsEditDictionaryPageTest', 'DISABLED_All', function() {
TEST_F('CrSettingsEditDictionaryPageTest', 'All', function() {
mocha.run();
});
......@@ -1551,8 +1542,7 @@ CrSettingsLanguagesTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsLanguagesTest', 'DISABLED_All', function() {
TEST_F('CrSettingsLanguagesTest', 'All', function() {
mocha.run();
});
......@@ -1589,13 +1579,11 @@ TEST_F('CrSettingsLanguagesPageTest', 'LanguageMenu', function() {
mocha.grep(assert(languages_page_tests.TestNames.LanguageMenu)).run();
});
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsLanguagesPageTest', 'DISABLED_InputMethods', function() {
TEST_F('CrSettingsLanguagesPageTest', 'InputMethods', function() {
mocha.grep(assert(languages_page_tests.TestNames.InputMethods)).run();
});
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsLanguagesPageTest', 'DISABLED_Spellcheck', function() {
TEST_F('CrSettingsLanguagesPageTest', 'Spellcheck', function() {
mocha.grep(assert(languages_page_tests.TestNames.Spellcheck)).run();
});
......@@ -1616,8 +1604,7 @@ CrSettingsRouteTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsRouteTest', 'DISABLED_All', function() {
TEST_F('CrSettingsRouteTest', 'All', function() {
mocha.run();
});
......@@ -1634,8 +1621,13 @@ CrSettingsNonExistentRouteTest.prototype = {
browsePreload: 'chrome://settings/non/existent/route',
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsNonExistentRouteTest', 'DISABLED_All', function() {
// Failing on ChromiumOS dbg. https://crbug.com/709442
GEN('#if (defined(OS_WIN) || defined(OS_CHROMEOS)) && !defined(NDEBUG)');
GEN('#define MAYBE_NonExistentRoute DISABLED_NonExistentRoute');
GEN('#else');
GEN('#define MAYBE_NonExistentRoute NonExistentRoute');
GEN('#endif');
TEST_F('CrSettingsNonExistentRouteTest', 'MAYBE_NonExistentRoute', function() {
suite('NonExistentRoutes', function() {
test('redirect to basic', function() {
assertEquals(settings.routes.BASIC, settings.getCurrentRoute());
......@@ -1658,8 +1650,7 @@ CrSettingsRouteDynamicParametersTest.prototype = {
browsePreload: 'chrome://settings/search?guid=a%2Fb&foo=42',
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrSettingsRouteDynamicParametersTest', 'DISABLED_All', function() {
TEST_F('CrSettingsRouteDynamicParametersTest', 'All', function() {
suite('DynamicParameters', function() {
test('get parameters from URL and navigation', function(done) {
assertEquals(settings.routes.SEARCH, settings.getCurrentRoute());
......@@ -1760,8 +1751,7 @@ CrControlledButtonTest.prototype = {
]),
};
// Flaky, see https://crbug.com/871692 .
TEST_F('CrControlledButtonTest', 'DISABLED_All', function() {
TEST_F('CrControlledButtonTest', 'All', function() {
mocha.run();
});
......
tools/perf/expectations.config
View file @ 2228aa6d
......@@ -238,7 +238,6 @@ crbug.com/837397 [ Linux ] system_health.memory_desktop/load_accessibility:shopp
crbug.com/869118 [ Linux ] system_health.memory_desktop/long_running:tools:gmail-background [ Skip ]
crbug.com/836447 [ ChromeOS ] system_health.memory_desktop/multitab:misc:typical24 [ Skip ]
crbug.com/799734 [ Win ] system_health.memory_desktop/browse:media:tumblr [ Skip ]
crbug.com/870852 [ Win ] system_health.memory_desktop/browse:media:pinterest [ Skip ]
# Benchmark: system_health.memory_mobile
crbug.com/787001 [ Android_Webview ] system_health.memory_mobile/load:media:soundcloud [ Skip ]
......
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