Commit 4ff78330 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Disable flaky SitePerProcessHighDPIHitTestBrowserTest on TSAN.

BUG=833380
TBR=mcnee@chromium.org
NOTRY=true

Change-Id: Ia38901113736af2fa923c301769282e834d531c3
Reviewed-on: https://chromium-review.googlesource.com/1026830Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553322}
parent 91251881
...@@ -1344,12 +1344,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -1344,12 +1344,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
// High DPI browser tests are not needed on Android, and confuse some of the // High DPI browser tests are not needed on Android, and confuse some of the
// coordinate calculations. Android uses fixed device scale factor. // coordinate calculations. Android uses fixed device scale factor.
// Windows is disabled because of https://crbug.com/545547. // Windows is disabled because of https://crbug.com/545547.
#define MAYBE_HighDPISurfaceHitTestTest DISABLED_SurfaceHitTestTest #define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest
#elif defined(THREAD_SANITIZER)
// Flaky: https://crbug.com/833380
#define MAYBE_SurfaceHitTestTest DISABLED_SurfaceHitTestTest
#else #else
#define MAYBE_HighDPISurfaceHitTestTest SurfaceHitTestTest #define MAYBE_SurfaceHitTestTest SurfaceHitTestTest
#endif #endif
IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest,
MAYBE_HighDPISurfaceHitTestTest) { MAYBE_SurfaceHitTestTest) {
SurfaceHitTestTestHelper(shell(), embedded_test_server()); SurfaceHitTestTestHelper(shell(), embedded_test_server());
} }
...@@ -1370,8 +1373,14 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -1370,8 +1373,14 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
OverlapSurfaceHitTestHelper(shell(), embedded_test_server()); OverlapSurfaceHitTestHelper(shell(), embedded_test_server());
} }
#if defined(THREAD_SANITIZER)
// Flaky: https://crbug.com/833380
#define MAYBE_OverlapSurfaceHitTestTest DISABLED_OverlapSurfaceHitTestTest
#else
#define MAYBE_OverlapSurfaceHitTestTest OverlapSurfaceHitTestTest
#endif
IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest,
OverlapSurfaceHitTestTest) { MAYBE_OverlapSurfaceHitTestTest) {
OverlapSurfaceHitTestHelper(shell(), embedded_test_server()); OverlapSurfaceHitTestHelper(shell(), embedded_test_server());
} }
...@@ -2097,8 +2106,16 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -2097,8 +2106,16 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
embedded_test_server()); embedded_test_server());
} }
#if defined(THREAD_SANITIZER)
// Flaky: https://crbug.com/833380
#define MAYBE_CursorUpdateReceivedFromCrossSiteIframe \
DISABLED_CursorUpdateReceivedFromCrossSiteIframe
#else
#define MAYBE_CursorUpdateReceivedFromCrossSiteIframe \
CursorUpdateReceivedFromCrossSiteIframe
#endif
IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest,
CursorUpdateReceivedFromCrossSiteIframe) { MAYBE_CursorUpdateReceivedFromCrossSiteIframe) {
CursorUpdateReceivedFromCrossSiteIframeHelper(shell(), CursorUpdateReceivedFromCrossSiteIframeHelper(shell(),
embedded_test_server()); embedded_test_server());
} }
...@@ -3168,12 +3185,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest, ...@@ -3168,12 +3185,15 @@ IN_PROC_BROWSER_TEST_P(SitePerProcessHitTestBrowserTest,
#if defined(OS_ANDROID) || defined(OS_WIN) #if defined(OS_ANDROID) || defined(OS_WIN)
// High DPI tests don't work properly on Android, which has fixed scale factor. // High DPI tests don't work properly on Android, which has fixed scale factor.
// Windows is disabled because of https://crbug.com/545547. // Windows is disabled because of https://crbug.com/545547.
#define MAYBE_HighDPICreateContextMenuTest DISABLED_HighDPICreateContextMenuTest #define MAYBE_CreateContextMenuTest DISABLED_CreateContextMenuTest
#elif defined(THREAD_SANITIZER)
// Flaky: https://crbug.com/833380
#define MAYBE_CreateContextMenuTest DISABLED_CreateContextMenuTest
#else #else
#define MAYBE_HighDPICreateContextMenuTest HighDPICreateContextMenuTest #define MAYBE_CreateContextMenuTest CreateContextMenuTest
#endif #endif
IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest, IN_PROC_BROWSER_TEST_P(SitePerProcessHighDPIHitTestBrowserTest,
MAYBE_HighDPICreateContextMenuTest) { MAYBE_CreateContextMenuTest) {
CreateContextMenuTestHelper(shell(), embedded_test_server()); CreateContextMenuTestHelper(shell(), embedded_test_server());
} }
......
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