Skip to content

GitLab

T
tangled
Commit 90f0020c authored by Dominic Mazzoni's avatar Dominic Mazzoni Committed by Commit Bot
Browse files
Options

Fix flakiness in DumpAccessibilityTreeTest.AccessibilityIframePadding 

We have logic to iterate over all frames and wait for them to finish
loading, but that logic doesn't work if there are two frames with the
same url. Change the test to use frames with different urls.

Bug: 805998
Change-Id: I4d7d514cc0d638a95b2ddf445a7dbf59f1d73cef
Tbr: aboxhall@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/938028Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539288}
parent f859d617
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
content/browser/accessibility/dump_accessibility_tree_browsertest.cc
View file @ 90f0020c
......@@ -1202,14 +1202,7 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
AccessibilityIframeCoordinatesCrossProcess) {
RunHtmlTest(FILE_PATH_LITERAL("iframe-coordinates-cross-process.html"));
}
// Flaky on Win7 and Win10. http://crbug.com/805998
#ifdef OS_WIN
#define MAYBE_AccessibilityIframePadding DISABLED_AccessibilityIframePadding
#else
#define MAYBE_AccessibilityIframePadding AccessibilityIframePadding
#endif
IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
MAYBE_AccessibilityIframePadding) {
IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityIframePadding) {
RunHtmlTest(FILE_PATH_LITERAL("iframe-padding.html"));
}
......
content/test/data/accessibility/html/frame/button2.html 0 → 100644
View file @ 90f0020c
<!DOCTYPE html>
<html>
<body style="margin: 0; padding: 0;">
<div style="width: 300px; height: 100px;">
<button style="margin: 25px; border: 0; width: 250px; height: 50px">
Second Button
</button>
</div>
</body>
</html>
content/test/data/accessibility/html/iframe-padding-expected-blink.txt
View file @ 90f0020c
......@@ -6,4 +6,4 @@ rootWebArea pageLocation=(0, 0)
++iframe pageLocation=(30, 230) pageSize=(300, 100)
++++rootWebArea pageLocation=(30, 230) pageSize=(300, 100)
++++++genericContainer pageLocation=(30, 230) pageSize=(300, 100)
++++++++button pageLocation=(55, 255) pageSize=(250, 50) name='Ordinary Button'
++++++++button pageLocation=(55, 255) pageSize=(250, 50) name='Second Button'
content/test/data/accessibility/html/iframe-padding.html
View file @ 90f0020c
......@@ -10,7 +10,7 @@
<iframe width=300 height=100 src="frame/button.html" style="position: absolute; left: 0; top: 0; border: 0; padding: 0; margin: 0;"></iframe>
</div>
<div>
<iframe width=300 height=100 src="frame/button.html" style="position: absolute; left: 0; top: 200px; border: 5px solid #ccf; padding: 25px; margin: 0;"></iframe>
<iframe width=300 height=100 src="frame/button2.html" style="position: absolute; left: 0; top: 200px; border: 5px solid #ccf; padding: 25px; margin: 0;"></iframe>
</div>
</body>
</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