Commit 49aef8bc authored by Stephen McGruer's avatar Stephen McGruer Committed by Commit Bot

[Sheriff] Disable SaveAsMHTML on Linux Tests (dbg)

TBR=benwells@chromium.org

Bug: 1017305
Change-Id: Ia6d3f44d2b9fbe139192e8057167063aefcee7f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875386Reviewed-by: default avatarStephen McGruer <smcgruer@chromium.org>
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708713}
parent 49d1cf7f
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "base/base_switches.h" #include "base/base_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/active_tab_permission_granter.h" #include "chrome/browser/extensions/active_tab_permission_granter.h"
#include "chrome/browser/extensions/api/page_capture/page_capture_api.h" #include "chrome/browser/extensions/api/page_capture/page_capture_api.h"
#include "chrome/browser/extensions/extension_action_runner.h" #include "chrome/browser/extensions/extension_action_runner.h"
...@@ -67,15 +68,21 @@ class PageCaptureSaveAsMHTMLDelegate ...@@ -67,15 +68,21 @@ class PageCaptureSaveAsMHTMLDelegate
// TODO(crbug.com/961017): Fix memory leaks in tests and re-enable on LSAN. // TODO(crbug.com/961017): Fix memory leaks in tests and re-enable on LSAN.
#ifdef LEAK_SANITIZER #ifdef LEAK_SANITIZER
#define MAYBE_SaveAsMHTML DISABLED_SaveAsMHTML
#define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \ #define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \
DISABLED_SaveAsMHTMLWithActiveTabWithFileAccess DISABLED_SaveAsMHTMLWithActiveTabWithFileAccess
#else #else
#define MAYBE_SaveAsMHTML SaveAsMHTML
#define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \ #define MAYBE_SaveAsMHTMLWithActiveTabWithFileAccess \
SaveAsMHTMLWithActiveTabWithFileAccess SaveAsMHTMLWithActiveTabWithFileAccess
#endif #endif
// TODO(crbug.com/961017): Fix memory leaks in tests and re-enable on LSAN.
// Also flaky-failing on Linux Tests (dbg): https://crbug.com/1017305
#if defined(LEAK_SANITIZER) || (defined(OS_LINUX) && !defined(NDEBUG))
#define MAYBE_SaveAsMHTML DISABLED_SaveAsMHTML
#else
#define MAYBE_SaveAsMHTML SaveAsMHTML
#endif
IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) { IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest, MAYBE_SaveAsMHTML) {
ASSERT_TRUE(StartEmbeddedTestServer()); ASSERT_TRUE(StartEmbeddedTestServer());
PageCaptureSaveAsMHTMLDelegate delegate; PageCaptureSaveAsMHTMLDelegate delegate;
......
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