Commit 7d03223d authored by Marina Ciocea's avatar Marina Ciocea Committed by Commit Bot

Disable flaky WebstoreInlineInstaller tests on Linux ASan LSan.

Tests disabled:
WebstoreInlineInstallerTest.ReinstallDisabledExtension
WebstoreInlineInstallerListenerTest.BothListenersTest

TBR=rdevlin.cronin@chromium.org

Bug: 889804
Change-Id: Iecccc27a4540685099e895aa71f3504e91978ef3
Reviewed-on: https://chromium-review.googlesource.com/1249121
Commit-Queue: Marina Ciocea <marinaciocea@chromium.org>
Reviewed-by: default avatarMarina Ciocea <marinaciocea@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594661}
parent e6cf27ae
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/values.h" #include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
...@@ -333,9 +334,15 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest, ...@@ -333,9 +334,15 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
registry->GenerateInstalledExtensionsSet()->Contains(kTestExtensionId)); registry->GenerateInstalledExtensionsSet()->Contains(kTestExtensionId));
} }
// Flaky on Linux ASan LSan (https://crbug.com/889804)
#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
#define MAYBE_ReinstallDisabledExtension DISABLED_ReinstallDisabledExtension
#else
#define MAYBE_ReinstallDisabledExtension ReinstallDisabledExtension
#endif
// Ensure that inline-installing a disabled extension simply re-enables it. // Ensure that inline-installing a disabled extension simply re-enables it.
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest, IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerTest,
ReinstallDisabledExtension) { MAYBE_ReinstallDisabledExtension) {
// Install an extension via inline install, and confirm it is successful. // Install an extension via inline install, and confirm it is successful.
AutoAcceptInstall(); AutoAcceptInstall();
ui_test_utils::NavigateToURL( ui_test_utils::NavigateToURL(
...@@ -543,7 +550,14 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest, ...@@ -543,7 +550,14 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest,
RunTest("download_progress_listener.html"); RunTest("download_progress_listener.html");
} }
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest, BothListenersTest) { // Flaky on Linux ASan LSan (https://crbug.com/889804)
#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
#define MAYBE_BothListenersTest DISABLED_BothListenersTest
#else
#define MAYBE_BothListenersTest BothListenersTest
#endif
IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest,
MAYBE_BothListenersTest) {
RunTest("both_listeners.html"); RunTest("both_listeners.html");
// The extension should be installed. // The extension should be installed.
ExtensionRegistry* registry = ExtensionRegistry::Get(profile()); ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
......
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