Skip to content

Commit

Permalink
Deflake fast/frames/seamless/*
Browse files Browse the repository at this point in the history
These tests are periodically failing because a newline has been added to
the 'textContent' of a frame. This seems to be because of asynchronicity
in when the frame's 'load' event triggers (either the next line has been
parsed, or it hasn't).

This patch avoids the problem by trimming the string before comparing it
to the expected string.

BUG=316380

Review URL: https://codereview.chromium.org/91363003

git-svn-id: svn://svn.chromium.org/blink/trunk@163260 bbb929c8-8fbe-4397-9dbb-9b2b20218538
  • Loading branch information
mkwst@chromium.org committed Dec 5, 2013
1 parent d33f162 commit 1a19345
Show file tree
Hide file tree
Showing 29 changed files with 28 additions and 29 deletions.
1 change: 0 additions & 1 deletion third_party/WebKit/LayoutTests/StaleTestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ webkit.org/b/104489 [ Win ] http/tests/w3c/webperf/submission/Intel/user-timing/
webkit.org/b/104489 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_attribute_order.html [ WontFix ]
webkit.org/b/104489 [ Win ] http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_script_types.html [ WontFix ]

webkit.org/b/112980 [ Win Mac ] fast/frames/seamless/seamless-form-post-override.html [ WontFix ]
webkit.org/b/112610 [ Win ] fast/text/word-space-with-kerning-3.html [ WontFix ]

webkit.org/b/78830 [ Mac ] svg/custom/mask-invalidation.svg [ WontFix ]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].frames[0].document.body.textContent is "DONE\n"
PASS frames[0].frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].frames[0].document.body.textContent is "DONE\n"
PASS frames[0].frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].frames[0].document.body.textContent is "DONE\n"
PASS frames[0].frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].frames[0].document.body.textContent is "DONE\n"
PASS frames[0].frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].document.body.textContent is "DONE\n"
PASS frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PASS successfullyParsed is true

TEST COMPLETE
PASS frames[0].frames[0].document.body.textContent is "DONE\n"
PASS frames[0].frames[0].document.body.textContent.trim() is "DONE"

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
testRunner.waitUntilDone();

window.addEventListener('message', function(evt) {
shouldBeEqualToString("frames[0].document.body.textContent", "DONE\n");
shouldBeEqualToString("frames[0].document.body.textContent.trim()", "DONE");

if (window.testRunner)
testRunner.notifyDone();
Expand Down

0 comments on commit 1a19345

Please sign in to comment.