Commit 844e97ae authored by Xida Chen's avatar Xida Chen Committed by Chromium LUCI CQ

[sheriff] Disable ManifestBrowserTest.CorsManifest on Linux

TBR=eirage@chromium.org
NOTRY=true

Bug: 1122546
Change-Id: Ic158622c15bf3eff41d63aa735e5be5cd4a3b8fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2636945Reviewed-by: default avatarXida Chen <xidachen@chromium.org>
Reviewed-by: default avatarElla Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844908}
parent 59582113
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
...@@ -359,7 +360,13 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, FileHandlerManifest) { ...@@ -359,7 +360,13 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, FileHandlerManifest) {
// If a page's manifest lives in a different origin, it should follow the CORS // If a page's manifest lives in a different origin, it should follow the CORS
// rules and requesting the manifest should return an empty manifest (unless the // rules and requesting the manifest should return an empty manifest (unless the
// response contains CORS headers). // response contains CORS headers).
IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CorsManifest) { // Flaky on linux: crbug.com/1122546
#if defined(OS_LINUX)
#define MAYBE_CorsManifest DISABLED_CorsManifest
#else
#define MAYBE_CorsManifest CorsManifest
#endif
IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, MAYBE_CorsManifest) {
ASSERT_TRUE(cors_embedded_test_server()->Start()); ASSERT_TRUE(cors_embedded_test_server()->Start());
ASSERT_NE(embedded_test_server()->port(), ASSERT_NE(embedded_test_server()->port(),
cors_embedded_test_server()->port()); cors_embedded_test_server()->port());
......
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