Commit 585d8e3e authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot

Disable a number of flaky extensions tests.

These tests are flaky on ASAN builds, see bug for details.

Tbr: rdevlin.cronin@chromium.org
Bug: 997634
Change-Id: I07ecffd1050c51e3957109b3f0ee491f7a78bd97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769582Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690431}
parent 266453b1
...@@ -146,7 +146,13 @@ class ExtensionCrashRecoveryTest : public extensions::ExtensionBrowserTest { ...@@ -146,7 +146,13 @@ class ExtensionCrashRecoveryTest : public extensions::ExtensionBrowserTest {
content::ScopedAllowRendererCrashes scoped_allow_renderer_crashes_; content::ScopedAllowRendererCrashes scoped_allow_renderer_crashes_;
}; };
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, Basic) { // Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_Basic DISABLED_Basic
#else
#define MAYBE_Basic Basic
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, MAYBE_Basic) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
const size_t crash_count_before = GetTerminatedExtensionCount(); const size_t crash_count_before = GetTerminatedExtensionCount();
LoadTestExtension(); LoadTestExtension();
...@@ -243,8 +249,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ...@@ -243,8 +249,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
ASSERT_EQ(0U, CountNotifications()); ASSERT_EQ(0U, CountNotifications());
} }
// Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_ReloadIndependentlyNavigatePage \
DISABLED_ReloadIndependentlyNavigatePage
#else
#define MAYBE_ReloadIndependentlyNavigatePage ReloadIndependentlyNavigatePage
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
ReloadIndependentlyNavigatePage) { MAYBE_ReloadIndependentlyNavigatePage) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
LoadTestExtension(); LoadTestExtension();
CrashExtension(first_extension_id_); CrashExtension(first_extension_id_);
...@@ -279,7 +292,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ShutdownWhileCrashed) { ...@@ -279,7 +292,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ShutdownWhileCrashed) {
ASSERT_EQ(count_before, GetEnabledExtensionCount()); ASSERT_EQ(count_before, GetEnabledExtensionCount());
} }
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) { // Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_TwoExtensionsCrashFirst DISABLED_TwoExtensionsCrashFirst
#else
#define MAYBE_TwoExtensionsCrashFirst TwoExtensionsCrashFirst
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
MAYBE_TwoExtensionsCrashFirst) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
LoadTestExtension(); LoadTestExtension();
LoadSecondExtension(); LoadSecondExtension();
...@@ -292,7 +312,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) { ...@@ -292,7 +312,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashFirst) {
CheckExtensionConsistency(second_extension_id_); CheckExtensionConsistency(second_extension_id_);
} }
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) { // Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_TwoExtensionsCrashSecond DISABLED_TwoExtensionsCrashSecond
#else
#define MAYBE_TwoExtensionsCrashSecond TwoExtensionsCrashSecond
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
MAYBE_TwoExtensionsCrashSecond) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
LoadTestExtension(); LoadTestExtension();
LoadSecondExtension(); LoadSecondExtension();
...@@ -305,8 +332,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) { ...@@ -305,8 +332,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsCrashSecond) {
CheckExtensionConsistency(second_extension_id_); CheckExtensionConsistency(second_extension_id_);
} }
// Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_TwoExtensionsCrashBothAtOnce DISABLED_TwoExtensionsCrashBothAtOnce
#else
#define MAYBE_TwoExtensionsCrashBothAtOnce TwoExtensionsCrashBothAtOnce
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
TwoExtensionsCrashBothAtOnce) { MAYBE_TwoExtensionsCrashBothAtOnce) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
const size_t crash_count_before = GetTerminatedExtensionCount(); const size_t crash_count_before = GetTerminatedExtensionCount();
LoadTestExtension(); LoadTestExtension();
...@@ -332,7 +365,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ...@@ -332,7 +365,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
} }
} }
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, TwoExtensionsOneByOne) { // Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_TwoExtensionsOneByOne DISABLED_TwoExtensionsOneByOne
#else
#define MAYBE_TwoExtensionsOneByOne TwoExtensionsOneByOne
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
MAYBE_TwoExtensionsOneByOne) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
LoadTestExtension(); LoadTestExtension();
CrashExtension(first_extension_id_); CrashExtension(first_extension_id_);
...@@ -393,8 +433,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ...@@ -393,8 +433,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
CheckExtensionConsistency(second_extension_id_); CheckExtensionConsistency(second_extension_id_);
} }
// Flaky on ASAN builds (https://crbug.com/997634)
#if defined(ADDRESS_SANITIZER)
#define MAYBE_TwoExtensionsReloadIndependently \
DISABLED_TwoExtensionsReloadIndependently
#else
#define MAYBE_TwoExtensionsReloadIndependently TwoExtensionsReloadIndependently
#endif
IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest,
TwoExtensionsReloadIndependently) { MAYBE_TwoExtensionsReloadIndependently) {
const size_t count_before = GetEnabledExtensionCount(); const size_t count_before = GetEnabledExtensionCount();
LoadTestExtension(); LoadTestExtension();
LoadSecondExtension(); LoadSecondExtension();
......
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