Commit 5da20288 authored by Olga Sharonova's avatar Olga Sharonova Committed by Commit Bot

[Sheriff] Disabling flaky [ImpressionDeclaration/ConversionRegistration]BrowserTest.* on Win

Some are disabled individually already, but now the rest become flaky. Bunch-disabling quickly
TBR=csharrison@chromium.org

Bug: 1087775
Change-Id: Ieddbd847eede193be3a974fb1a4d16ccaec3429a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218782Reviewed-by: default avatarOlga Sharonova <olka@chromium.org>
Commit-Queue: Olga Sharonova <olka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773184}
parent 4405727f
...@@ -76,9 +76,18 @@ class TestConversionHost : public ConversionHost { ...@@ -76,9 +76,18 @@ class TestConversionHost : public ConversionHost {
base::RunLoop conversion_waiter_; base::RunLoop conversion_waiter_;
}; };
class ConversionRegistrationBrowserTest : public ContentBrowserTest { // https://crbug.com/1087775: Flaky on Windows.
// Note: there are individual tests disabled separatly earlier.
#if defined(OS_WIN)
#define MAYBE_ConversionRegistrationBrowserTest \
DISABLED_ConversionRegistrationBrowserTest
#else
#define MAYBE_ConversionRegistrationBrowserTest \
ConversionRegistrationBrowserTest
#endif
class MAYBE_ConversionRegistrationBrowserTest : public ContentBrowserTest {
public: public:
ConversionRegistrationBrowserTest() { MAYBE_ConversionRegistrationBrowserTest() {
feature_list_.InitAndEnableFeature(features::kConversionMeasurement); feature_list_.InitAndEnableFeature(features::kConversionMeasurement);
} }
...@@ -119,7 +128,7 @@ class ConversionRegistrationBrowserTest : public ContentBrowserTest { ...@@ -119,7 +128,7 @@ class ConversionRegistrationBrowserTest : public ContentBrowserTest {
#else #else
#define MAYBE_ConversionRegistration_NoCrash ConversionRegistration_NoCrash #define MAYBE_ConversionRegistration_NoCrash ConversionRegistration_NoCrash
#endif #endif
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
MAYBE_ConversionRegistration_NoCrash) { MAYBE_ConversionRegistration_NoCrash) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -131,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -131,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_TRUE(NavigateToURL(shell(), GURL("about:blank")))); EXPECT_TRUE(NavigateToURL(shell(), GURL("about:blank"))));
} }
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
ConversionRegistered_ConversionDataReceived) { ConversionRegistered_ConversionDataReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -151,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -151,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
#define MAYBE_FeaturePolicyDisabled_ConversionNotRegistered \ #define MAYBE_FeaturePolicyDisabled_ConversionNotRegistered \
FeaturePolicyDisabled_ConversionNotRegistered FeaturePolicyDisabled_ConversionNotRegistered
#endif #endif
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
MAYBE_FeaturePolicyDisabled_ConversionNotRegistered) { MAYBE_FeaturePolicyDisabled_ConversionNotRegistered) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), embedded_test_server()->GetURL( shell(), embedded_test_server()->GetURL(
...@@ -178,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -178,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
#define MAYBE_ConversionRegistrationNotRedirect_NotReceived \ #define MAYBE_ConversionRegistrationNotRedirect_NotReceived \
ConversionRegistrationNotRedirect_NotReceived ConversionRegistrationNotRedirect_NotReceived
#endif #endif
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
MAYBE_ConversionRegistrationNotRedirect_NotReceived) { MAYBE_ConversionRegistrationNotRedirect_NotReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -205,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -205,7 +214,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ConversionRegistrationBrowserTest, MAYBE_ConversionRegistrationBrowserTest,
ConversionRegistrationNotSameOriginRedirect_NotReceived) { ConversionRegistrationNotSameOriginRedirect_NotReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -236,7 +245,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -236,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ(0u, host->num_conversions()); EXPECT_EQ(0u, host->num_conversions());
} }
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
ConversionRegistrationIsSameOriginRedirect_Received) { ConversionRegistrationIsSameOriginRedirect_Received) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -258,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -258,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_EQ(200UL, host->WaitForNumConversions(1)); EXPECT_EQ(200UL, host->WaitForNumConversions(1));
} }
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
ConversionRegistrationInPreload_NotReceived) { ConversionRegistrationInPreload_NotReceived) {
std::unique_ptr<TestConversionHost> host = std::unique_ptr<TestConversionHost> host =
TestConversionHost::ReplaceAndGetConversionHost(web_contents()); TestConversionHost::ReplaceAndGetConversionHost(web_contents());
...@@ -270,7 +279,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -270,7 +279,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_EQ(0u, host->num_conversions()); EXPECT_EQ(0u, host->num_conversions());
} }
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
ConversionRegistrationNoData_ReceivedZero) { ConversionRegistrationNoData_ReceivedZero) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -285,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -285,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_EQ(0UL, host->WaitForNumConversions(1)); EXPECT_EQ(0UL, host->WaitForNumConversions(1));
} }
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ConversionRegistrationBrowserTest,
ConversionRegisteredFromChildFrame_NotReceived) { ConversionRegisteredFromChildFrame_NotReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
shell(), shell(),
...@@ -305,7 +314,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest, ...@@ -305,7 +314,7 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ConversionRegistrationBrowserTest, MAYBE_ConversionRegistrationBrowserTest,
RegisterWithDifferentUrlTypes_ConversionReceivedOrIgnored) { RegisterWithDifferentUrlTypes_ConversionReceivedOrIgnored) {
const char kSecureHost[] = "a.test"; const char kSecureHost[] = "a.test";
struct { struct {
......
...@@ -66,9 +66,17 @@ class ImpressionObserver : public WebContentsObserver { ...@@ -66,9 +66,17 @@ class ImpressionObserver : public WebContentsObserver {
base::RunLoop impression_loop_; base::RunLoop impression_loop_;
}; };
class ImpressionDeclarationBrowserTest : public ContentBrowserTest { // https://crbug.com/1087775: Flaky on Windows.
// Note: there are individual tests disabled separatly earlier.
#if defined(OS_WIN)
#define MAYBE_ImpressionDeclarationBrowserTest \
DISABLED_ImpressionDeclarationBrowserTest
#else
#define MAYBE_ImpressionDeclarationBrowserTest ImpressionDeclarationBrowserTest
#endif
class MAYBE_ImpressionDeclarationBrowserTest : public ContentBrowserTest {
public: public:
ImpressionDeclarationBrowserTest() { MAYBE_ImpressionDeclarationBrowserTest() {
feature_list_.InitAndEnableFeature(features::kConversionMeasurement); feature_list_.InitAndEnableFeature(features::kConversionMeasurement);
} }
...@@ -100,7 +108,7 @@ class ImpressionDeclarationBrowserTest : public ContentBrowserTest { ...@@ -100,7 +108,7 @@ class ImpressionDeclarationBrowserTest : public ContentBrowserTest {
std::unique_ptr<net::EmbeddedTestServer> https_server_; std::unique_ptr<net::EmbeddedTestServer> https_server_;
}; };
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionTagClicked_ImpressionReceived) { ImpressionTagClicked_ImpressionReceived) {
ImpressionObserver impression_observer(web_contents()); ImpressionObserver impression_observer(web_contents());
GURL page_url = GURL page_url =
...@@ -132,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -132,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
// Test is flaky: https://crbug.com/1077216 // Test is flaky: https://crbug.com/1077216
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ImpressionDeclarationBrowserTest, MAYBE_ImpressionDeclarationBrowserTest,
DISABLED_ImpressionTagNavigatesRemoteFrame_ImpressionReceived) { DISABLED_ImpressionTagNavigatesRemoteFrame_ImpressionReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
...@@ -160,7 +168,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -160,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(
// Test frequently flakes due to timeout. ( https://crbug.com/1084201 ) // Test frequently flakes due to timeout. ( https://crbug.com/1084201 )
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ImpressionDeclarationBrowserTest, MAYBE_ImpressionDeclarationBrowserTest,
DISABLED_ImpressionTagNavigatesExistingRemoteFrame_ImpressionReceived) { DISABLED_ImpressionTagNavigatesExistingRemoteFrame_ImpressionReceived) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
...@@ -193,7 +201,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -193,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ(1UL, impression_observer.last_impression().impression_data); EXPECT_EQ(1UL, impression_observer.last_impression().impression_data);
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionTagWithOutOfBoundData_DefaultedTo0) { ImpressionTagWithOutOfBoundData_DefaultedTo0) {
ImpressionObserver impression_observer(web_contents()); ImpressionObserver impression_observer(web_contents());
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
...@@ -215,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -215,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
} }
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ImpressionDeclarationBrowserTest, MAYBE_ImpressionDeclarationBrowserTest,
ImpressionTagNavigatesFromMiddleClick_ImpressionReceived) { ImpressionTagNavigatesFromMiddleClick_ImpressionReceived) {
GURL page_url = GURL page_url =
https_server()->GetURL("b.test", "/page_with_impression_creator.html"); https_server()->GetURL("b.test", "/page_with_impression_creator.html");
...@@ -250,7 +258,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -250,7 +258,7 @@ IN_PROC_BROWSER_TEST_F(
ImpressionTagNavigatesFromEnterPress_ImpressionReceived ImpressionTagNavigatesFromEnterPress_ImpressionReceived
#endif #endif
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(
ImpressionDeclarationBrowserTest, MAYBE_ImpressionDeclarationBrowserTest,
MAYBE_ImpressionTagNavigatesFromEnterPress_ImpressionReceived) { MAYBE_ImpressionTagNavigatesFromEnterPress_ImpressionReceived) {
GURL page_url = GURL page_url =
https_server()->GetURL("b.test", "/page_with_impression_creator.html"); https_server()->GetURL("b.test", "/page_with_impression_creator.html");
...@@ -282,7 +290,7 @@ IN_PROC_BROWSER_TEST_F( ...@@ -282,7 +290,7 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ(1UL, last_impression.impression_data); EXPECT_EQ(1UL, last_impression.impression_data);
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionOnInsecureSite_NotRegistered) { ImpressionOnInsecureSite_NotRegistered) {
// Navigate to a page with the non-https server. // Navigate to a page with the non-https server.
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
...@@ -301,7 +309,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -301,7 +309,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionWithInsecureDestination_NotRegistered) { ImpressionWithInsecureDestination_NotRegistered) {
// Navigate to a page with the non-https server. // Navigate to a page with the non-https server.
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
...@@ -320,7 +328,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -320,7 +328,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionWithInsecureReportingOrigin_NotRegistered) { ImpressionWithInsecureReportingOrigin_NotRegistered) {
// Navigate to a page with the non-https server. // Navigate to a page with the non-https server.
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
...@@ -341,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -341,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionWithFeaturePolicyDisabled_NotRegistered) { ImpressionWithFeaturePolicyDisabled_NotRegistered) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
...@@ -360,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -360,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionInSubframeWithoutFeaturePolicy_NotRegistered) { ImpressionInSubframeWithoutFeaturePolicy_NotRegistered) {
GURL page_url = https_server()->GetURL("b.test", "/page_with_iframe.html"); GURL page_url = https_server()->GetURL("b.test", "/page_with_iframe.html");
EXPECT_TRUE(NavigateToURL(web_contents(), page_url)); EXPECT_TRUE(NavigateToURL(web_contents(), page_url));
...@@ -382,7 +390,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -382,7 +390,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(impression_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionInSubframeWithFeaturePolicy_Registered) { ImpressionInSubframeWithFeaturePolicy_Registered) {
GURL page_url = https_server()->GetURL("b.test", "/page_with_iframe.html"); GURL page_url = https_server()->GetURL("b.test", "/page_with_iframe.html");
EXPECT_TRUE(NavigateToURL(web_contents(), page_url)); EXPECT_TRUE(NavigateToURL(web_contents(), page_url));
...@@ -407,7 +415,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -407,7 +415,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_EQ(1u, impression_observer.WaitForImpression().impression_data); EXPECT_EQ(1u, impression_observer.WaitForImpression().impression_data);
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
ImpressionNavigationReloads_NoImpression) { ImpressionNavigationReloads_NoImpression) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
...@@ -430,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -430,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
} }
// Same as the above test but via a renderer initiated reload. // Same as the above test but via a renderer initiated reload.
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
RendererReloadImpressionNavigation_NoImpression) { RendererReloadImpressionNavigation_NoImpression) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
...@@ -452,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, ...@@ -452,7 +460,7 @@ IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest,
EXPECT_TRUE(reload_observer.WaitForNavigationWithNoImpression()); EXPECT_TRUE(reload_observer.WaitForNavigationWithNoImpression());
} }
IN_PROC_BROWSER_TEST_F(ImpressionDeclarationBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_ImpressionDeclarationBrowserTest,
BackNavigateToImpressionNavigation_NoImpression) { BackNavigateToImpressionNavigation_NoImpression) {
EXPECT_TRUE(NavigateToURL( EXPECT_TRUE(NavigateToURL(
web_contents(), web_contents(),
......
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