Commit 9a2a20ac authored by Jan Wilken Dörrie's avatar Jan Wilken Dörrie Committed by Commit Bot

[Sheriff] Disable Flaky Conversion Browsertests on Windows

TBR=johnidel

Bug: 1087406
Change-Id: I86e0a81bb5a304f387e68233d33976f0460f702b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2220006Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: default avatarJohn Delaney <johnidel@chromium.org>
Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772707}
parent 71fb7f72
......@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/browser/conversions/conversion_host.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/common/content_features.h"
......@@ -135,8 +136,16 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_EQ(123UL, host->WaitForNumConversions(1));
}
// https://crbug.com/1087406: Flaky on Windows
#if defined(OS_WIN)
#define MAYBE_FeaturePolicyDisabled_ConversionNotRegistered \
DISABLED_FeaturePolicyDisabled_ConversionNotRegistered
#else
#define MAYBE_FeaturePolicyDisabled_ConversionNotRegistered \
FeaturePolicyDisabled_ConversionNotRegistered
#endif
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
FeaturePolicyDisabled_ConversionNotRegistered) {
MAYBE_FeaturePolicyDisabled_ConversionNotRegistered) {
EXPECT_TRUE(NavigateToURL(
shell(), embedded_test_server()->GetURL(
"/page_with_conversion_measurement_disabled.html")));
......@@ -154,8 +163,16 @@ IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
EXPECT_EQ(0u, host->num_conversions());
}
// https://crbug.com/1087406: Flaky on Windows
#if defined(OS_WIN)
#define MAYBE_ConversionRegistrationNotRedirect_NotReceived \
DISABLED_ConversionRegistrationNotRedirect_NotReceived
#else
#define MAYBE_ConversionRegistrationNotRedirect_NotReceived \
ConversionRegistrationNotRedirect_NotReceived
#endif
IN_PROC_BROWSER_TEST_F(ConversionRegistrationBrowserTest,
ConversionRegistrationNotRedirect_NotReceived) {
MAYBE_ConversionRegistrationNotRedirect_NotReceived) {
EXPECT_TRUE(NavigateToURL(
shell(),
embedded_test_server()->GetURL("/page_with_conversion_redirect.html")));
......
......@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/public/common/content_features.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test.h"
......@@ -186,9 +187,17 @@ IN_PROC_BROWSER_TEST_F(ConversionsBrowserTest,
EXPECT_EQ(expected_report.expected_url, expected_report.WaitForRequestUrl());
}
// https://crbug.com/1087406: Flaky on Windows
#if defined(OS_WIN)
#define MAYBE_MultipleImpressionsPerConversion_ReportsSentWithAttribution \
DISABLED_MultipleImpressionsPerConversion_ReportsSentWithAttribution
#else
#define MAYBE_MultipleImpressionsPerConversion_ReportsSentWithAttribution \
MultipleImpressionsPerConversion_ReportsSentWithAttribution
#endif
IN_PROC_BROWSER_TEST_F(
ConversionsBrowserTest,
MultipleImpressionsPerConversion_ReportsSentWithAttribution) {
MAYBE_MultipleImpressionsPerConversion_ReportsSentWithAttribution) {
std::vector<ExpectedReportWaiter> expected_reports;
expected_reports.emplace_back(
GURL("https://d.test/.well-known/"
......
......@@ -9,6 +9,7 @@
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/common/content_features.h"
......@@ -240,9 +241,17 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ(1UL, last_impression.impression_data);
}
// https://crbug.com/1087406: Flaky on Windows
#if defined(OS_WIN)
#define MAYBE_ImpressionTagNavigatesFromEnterPress_ImpressionReceived \
DISABLED_ImpressionTagNavigatesFromEnterPress_ImpressionReceived
#else
#define MAYBE_ImpressionTagNavigatesFromEnterPress_ImpressionReceived \
ImpressionTagNavigatesFromEnterPress_ImpressionReceived
#endif
IN_PROC_BROWSER_TEST_F(
ImpressionDeclarationBrowserTest,
ImpressionTagNavigatesFromEnterPress_ImpressionReceived) {
MAYBE_ImpressionTagNavigatesFromEnterPress_ImpressionReceived) {
GURL page_url =
https_server()->GetURL("b.test", "/page_with_impression_creator.html");
EXPECT_TRUE(NavigateToURL(web_contents(), page_url));
......
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