Commit 844ff0ce authored by Lukasz Anforowicz's avatar Lukasz Anforowicz Committed by Commit Bot

Disable flaky CrossSiteDocumentBlockingServiceWorkerTest on Android.

Bug: 809735
Change-Id: I9e5376b7fcea6f4a96fdf831b13bae801753e962
Tbr: creis@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/905748Reviewed-by: default avatarŁukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534853}
parent d495ed7d
......@@ -9,6 +9,7 @@
#include "base/strings/stringprintf.h"
#include "base/test/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
......@@ -405,6 +406,12 @@ class CrossSiteDocumentBlockingServiceWorkerTest : public ContentBrowserTest {
DISALLOW_COPY_AND_ASSIGN(CrossSiteDocumentBlockingServiceWorkerTest);
};
// TODO(lukasza): https://crbug.com/809735: Flaky on Android.
#if defined(OS_ANDROID)
#define MAYBE_NoNetwork DISABLED_NoNetwork
#else
#define MAYBE_NoNetwork NoNetwork
#endif
// Issue a cross-origin request that will be handled entirely within a service
// worker (without reaching the network - the cross-origin response will be
// "faked" within the same-origin service worker, because the service worker
......@@ -416,7 +423,8 @@ class CrossSiteDocumentBlockingServiceWorkerTest : public ContentBrowserTest {
//
// TODO(lukasza): https://crbug.com/715640: This test might become invalid
// after servicification of service workers.
IN_PROC_BROWSER_TEST_F(CrossSiteDocumentBlockingServiceWorkerTest, NoNetwork) {
IN_PROC_BROWSER_TEST_F(CrossSiteDocumentBlockingServiceWorkerTest,
MAYBE_NoNetwork) {
SetUpServiceWorker();
base::HistogramTester histograms;
......@@ -445,8 +453,14 @@ IN_PROC_BROWSER_TEST_F(CrossSiteDocumentBlockingServiceWorkerTest, NoNetwork) {
RESOURCE_TYPE_XHR);
}
// TODO(lukasza): https://crbug.com/809735: Flaky on Android.
#if defined(OS_ANDROID)
#define MAYBE_NetworkAndOpaqueResponse DISABLED_NetworkAndOpaqueResponse
#else
#define MAYBE_NetworkAndOpaqueResponse NetworkAndOpaqueResponse
#endif
IN_PROC_BROWSER_TEST_F(CrossSiteDocumentBlockingServiceWorkerTest,
NetworkAndOpaqueResponse) {
MAYBE_NetworkAndOpaqueResponse) {
SetUpServiceWorker();
// Build a script for XHR-ing a cross-origin, nosniff HTML document.
......
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