Commit ab70ca4f authored by Camille Lamy's avatar Camille Lamy Committed by Commit Bot

Disable 2 TaskManagerBrowserTests when MSan is enabled

They are taking too long to run and timeout when run with MSan.

TBR=jam@chromium.org

Bug: 890313
Change-Id: Ib7d1f3d6edcb62adcddbc54a0c636a9aae37d002
Reviewed-on: https://chromium-review.googlesource.com/1251453Reviewed-by: default avatarFrançois Doray <fdoray@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595120}
parent 10a65146
...@@ -677,7 +677,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, JSHeapMemory) { ...@@ -677,7 +677,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, JSHeapMemory) {
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
} }
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, SentDataObserved) { #if defined(MEMORY_SANITIZER)
// This tests times out when MSan is enabled. See https://crbug.com/890313.
#define MAYBE_SentDataObserved DISABLED_SentDataObserved
#else
#define MAYBE_SentDataObserved SentDataObserved
#endif
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_SentDataObserved) {
ShowTaskManager(); ShowTaskManager();
GURL test_gurl = embedded_test_server()->GetURL("/title1.html"); GURL test_gurl = embedded_test_server()->GetURL("/title1.html");
...@@ -709,7 +715,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, SentDataObserved) { ...@@ -709,7 +715,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, SentDataObserved) {
model()->GetColumnValue(ColumnSpecifier::TOTAL_NETWORK_USE, 0)); model()->GetColumnValue(ColumnSpecifier::TOTAL_NETWORK_USE, 0));
} }
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, TotalSentDataObserved) { #if defined(MEMORY_SANITIZER)
// This tests times out when MSan is enabled. See https://crbug.com/890313.
#define MAYBE_TotalSentDataObserved DISABLED_TotalSentDataObserved
#else
#define MAYBE_TotalSentDataObserved TotalSentDataObserved
#endif
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_TotalSentDataObserved) {
ShowTaskManager(); ShowTaskManager();
GURL test_gurl = embedded_test_server()->GetURL("/title1.html"); GURL test_gurl = embedded_test_server()->GetURL("/title1.html");
......
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