Commit 2d0c4b35 authored by Michael Giuffrida's avatar Michael Giuffrida Committed by Commit Bot

Disable ProcessMemoryMetricsEmitterTest browser_tests

These tests are blocking CLs that add new, unrelated UKMs due to how
they test metric collection. Work is already in progress to update these
tests; disable them until that work lands.

Bug: 761524
Change-Id: If5716b417c0c72dac99e49a1440b00c2f1e3466b
Reviewed-on: https://chromium-review.googlesource.com/827666Reviewed-by: default avatarSteven Holte <holte@chromium.org>
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524272}
parent 238244e1
...@@ -420,7 +420,9 @@ class ProcessMemoryMetricsEmitterTest : public ExtensionBrowserTest { ...@@ -420,7 +420,9 @@ class ProcessMemoryMetricsEmitterTest : public ExtensionBrowserTest {
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_FetchAndEmitMetrics DISABLED_FetchAndEmitMetrics #define MAYBE_FetchAndEmitMetrics DISABLED_FetchAndEmitMetrics
#else #else
#define MAYBE_FetchAndEmitMetrics FetchAndEmitMetrics // TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_FetchAndEmitMetrics DISABLED_FetchAndEmitMetrics
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
MAYBE_FetchAndEmitMetrics) { MAYBE_FetchAndEmitMetrics) {
...@@ -454,8 +456,10 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, ...@@ -454,8 +456,10 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
#define MAYBE_FetchAndEmitMetricsWithExtensions \ #define MAYBE_FetchAndEmitMetricsWithExtensions \
DISABLED_FetchAndEmitMetricsWithExtensions DISABLED_FetchAndEmitMetricsWithExtensions
#else #else
// TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_FetchAndEmitMetricsWithExtensions \ #define MAYBE_FetchAndEmitMetricsWithExtensions \
FetchAndEmitMetricsWithExtensions DISABLED_FetchAndEmitMetricsWithExtensions
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
MAYBE_FetchAndEmitMetricsWithExtensions) { MAYBE_FetchAndEmitMetricsWithExtensions) {
...@@ -499,8 +503,10 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, ...@@ -499,8 +503,10 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
#define MAYBE_FetchAndEmitMetricsWithHostedApps \ #define MAYBE_FetchAndEmitMetricsWithHostedApps \
DISABLED_FetchAndEmitMetricsWithHostedApps DISABLED_FetchAndEmitMetricsWithHostedApps
#else #else
// TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_FetchAndEmitMetricsWithHostedApps \ #define MAYBE_FetchAndEmitMetricsWithHostedApps \
FetchAndEmitMetricsWithHostedApps DISABLED_FetchAndEmitMetricsWithHostedApps
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
MAYBE_FetchAndEmitMetricsWithHostedApps) { MAYBE_FetchAndEmitMetricsWithHostedApps) {
...@@ -592,7 +598,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, ...@@ -592,7 +598,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_FetchDuringTrace DISABLED_FetchDuringTrace #define MAYBE_FetchDuringTrace DISABLED_FetchDuringTrace
#else #else
#define MAYBE_FetchDuringTrace FetchDuringTrace // TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_FetchDuringTrace DISABLED_FetchDuringTrace
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
MAYBE_FetchDuringTrace) { MAYBE_FetchDuringTrace) {
...@@ -650,7 +658,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, ...@@ -650,7 +658,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_FetchThreeTimes DISABLED_FetchThreeTimes #define MAYBE_FetchThreeTimes DISABLED_FetchThreeTimes
#else #else
#define MAYBE_FetchThreeTimes FetchThreeTimes // TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_FetchThreeTimes DISABLED_FetchThreeTimes
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, MAYBE_FetchThreeTimes) { IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, MAYBE_FetchThreeTimes) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
...@@ -680,7 +690,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, MAYBE_FetchThreeTimes) { ...@@ -680,7 +690,9 @@ IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, MAYBE_FetchThreeTimes) {
#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER)
#define MAYBE_ForegroundAndBackgroundPages DISABLED_ForegroundAndBackgroundPages #define MAYBE_ForegroundAndBackgroundPages DISABLED_ForegroundAndBackgroundPages
#else #else
#define MAYBE_ForegroundAndBackgroundPages ForegroundAndBackgroundPages // TODO(michaelpg): Remove this unconditional disabling once new UKM testing
// style CLs land: crbug.com/761524.
#define MAYBE_ForegroundAndBackgroundPages DISABLED_ForegroundAndBackgroundPages
#endif #endif
IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest, IN_PROC_BROWSER_TEST_F(ProcessMemoryMetricsEmitterTest,
MAYBE_ForegroundAndBackgroundPages) { MAYBE_ForegroundAndBackgroundPages) {
......
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