Commit 1027c702 authored by Martin Šrámek's avatar Martin Šrámek Committed by Commit Bot

Disable ConversionManagerImplTest.ExpiredReportsAtStartup_Delayed

...on Linux and Android, since it is flaky.

Bug: 1088449
Change-Id: Ia85259d80ba09cf0fa3472a41f6fc4308e11b98b
TBR: csharrison@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2230464Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Commit-Queue: Martin Šrámek <msramek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775045}
parent 9ed37bf9
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/time/clock.h" #include "base/time/clock.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "build/build_config.h"
#include "content/browser/conversions/conversion_report.h" #include "content/browser/conversions/conversion_report.h"
#include "content/browser/conversions/conversion_test_utils.h" #include "content/browser/conversions/conversion_test_utils.h"
#include "content/browser/conversions/storable_conversion.h" #include "content/browser/conversions/storable_conversion.h"
...@@ -313,7 +314,14 @@ TEST_F(ConversionManagerImplTest, ConversionsSentFromUI_ReportedImmediately) { ...@@ -313,7 +314,14 @@ TEST_F(ConversionManagerImplTest, ConversionsSentFromUI_ReportedImmediately) {
EXPECT_EQ(2u, test_reporter_->num_reports()); EXPECT_EQ(2u, test_reporter_->num_reports());
} }
TEST_F(ConversionManagerImplTest, ExpiredReportsAtStartup_Delayed) { // TODO(crbug.com/1088449): Flaky on Linux and Android.
#if defined(OS_LINUX) || defined(OS_ANDROID)
#define MAYBE_ExpiredReportsAtStartup_Delayed \
DISABLED_ExpiredReportsAtStartup_Delayed
#else
#define MAYBE_ExpiredReportsAtStartup_Delayed ExpiredReportsAtStartup_Delayed
#endif
TEST_F(ConversionManagerImplTest, MAYBE_ExpiredReportsAtStartup_Delayed) {
// Create a report that will be reported at t= 2 days. // Create a report that will be reported at t= 2 days.
base::Time start_time = clock().Now(); base::Time start_time = clock().Now();
conversion_manager_->HandleImpression( conversion_manager_->HandleImpression(
......
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