Commit c611ee08 authored by Mikhail Khokhlov's avatar Mikhail Khokhlov Committed by Commit Bot

Revert "[Sheriff]: Disable flaky TracingControllerTest.ProcessesPresentInTrace."

This reverts commit 9b369b62.

Reason for revert: The underlying issue has been fixed, the flakiness
should disappear now.

Original change's description:
> [Sheriff]: Disable flaky TracingControllerTest.ProcessesPresentInTrace.
> 
> BUG=1107612
> TBR=primiano@chromium.org
> 
> Change-Id: Iea8a925f79b364bb7d603061c4e4e50fc0f62fed
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2308913
> Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
> Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#790205}

TBR=primiano@chromium.org,karandeepb@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1107612
Change-Id: I2738878a6f61443a42be0e07e746c2916f720d8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317798Reviewed-by: default avatarMikhail Khokhlov <khokhlov@google.com>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Cr-Commit-Position: refs/heads/master@{#793574}
parent 32dbc06c
...@@ -352,6 +352,7 @@ class TracingControllerTest : public ContentBrowserTest { ...@@ -352,6 +352,7 @@ class TracingControllerTest : public ContentBrowserTest {
#define MAYBE_EnableAndStopTracingWithEmptyFile \ #define MAYBE_EnableAndStopTracingWithEmptyFile \
DISABLED_EnableAndStopTracingWithEmptyFile DISABLED_EnableAndStopTracingWithEmptyFile
#define MAYBE_DoubleStopTracing DISABLED_DoubleStopTracing #define MAYBE_DoubleStopTracing DISABLED_DoubleStopTracing
#define MAYBE_ProcessesPresentInTrace DISABLED_ProcessesPresentInTrace
#else #else
#define MAYBE_EnableAndStopTracing EnableAndStopTracing #define MAYBE_EnableAndStopTracing EnableAndStopTracing
#define MAYBE_DisableRecordingStoresMetadata DisableRecordingStoresMetadata #define MAYBE_DisableRecordingStoresMetadata DisableRecordingStoresMetadata
...@@ -362,6 +363,7 @@ class TracingControllerTest : public ContentBrowserTest { ...@@ -362,6 +363,7 @@ class TracingControllerTest : public ContentBrowserTest {
#define MAYBE_EnableAndStopTracingWithEmptyFile \ #define MAYBE_EnableAndStopTracingWithEmptyFile \
EnableAndStopTracingWithEmptyFile EnableAndStopTracingWithEmptyFile
#define MAYBE_DoubleStopTracing DoubleStopTracing #define MAYBE_DoubleStopTracing DoubleStopTracing
#define MAYBE_ProcessesPresentInTrace ProcessesPresentInTrace
#endif #endif
IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) { IN_PROC_BROWSER_TEST_F(TracingControllerTest, GetCategories) {
...@@ -501,10 +503,7 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_SystemTraceEvents) { ...@@ -501,10 +503,7 @@ IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_SystemTraceEvents) {
EXPECT_TRUE(last_data().find("systemTraceEvents") != std::string::npos); EXPECT_TRUE(last_data().find("systemTraceEvents") != std::string::npos);
} }
// TODO(crbug.com/1107612): Disabled due to flakiness. Also fails consistently IN_PROC_BROWSER_TEST_F(TracingControllerTest, MAYBE_ProcessesPresentInTrace) {
// on Android Asan (crbug.com/1045519).
IN_PROC_BROWSER_TEST_F(TracingControllerTest,
DISABLED_ProcessesPresentInTrace) {
TestStartAndStopTracingString(); TestStartAndStopTracingString();
EXPECT_TRUE(last_data().find("CrBrowserMain") != std::string::npos); EXPECT_TRUE(last_data().find("CrBrowserMain") != std::string::npos);
EXPECT_TRUE(last_data().find("CrRendererMain") != std::string::npos); EXPECT_TRUE(last_data().find("CrRendererMain") != std::string::npos);
......
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