Changeset 133934 in webkit

Timestamp:

Nov 8, 2012, 12:41:16 PM (12 years ago)

Author:

tony@chromium.org

Message:

Layout test editing/pasteboard/file-drag-to-editable.html flaky
​https://bugs.webkit.org/show_bug.cgi?id=101092

Reviewed by Ryosuke Niwa.

Fix a flaky test. The problem was that we were confusing the test harness by
trying to do a navigation before the initial load finished (the notifyDone()
call did nothing because waitUntilDone() was missing). Depending on the state
of the frame loader when the test run, there was a race in whether or not we
would dump the results before or after completing the script execution.

Fix this by restructuring the test to run during onload and by calling notifyDone()
after the file load attempt failed.

• editing/pasteboard/file-drag-to-editable-expected.txt:
• editing/pasteboard/script-tests/file-drag-to-editable.js:

(runTest.window.onbeforeunload): Simplify and don't run nofityDone yet.
(runTest): Run test during onload event.

• platform/chromium/TestExpectations: Remove flaky marker.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/pasteboard/file-drag-to-editable-expected.txt (modified) (1 diff)
• editing/pasteboard/script-tests/file-drag-to-editable.js (modified) (1 diff)
• platform/chromium/TestExpectations (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-08  Tony Chang  <tony@chromium.org>
+
+        Layout test editing/pasteboard/file-drag-to-editable.html flaky
+        https://bugs.webkit.org/show_bug.cgi?id=101092
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix a flaky test.  The problem was that we were confusing the test harness by
+        trying to do a navigation before the initial load finished (the notifyDone()
+        call did nothing because waitUntilDone() was missing).  Depending on the state
+        of the frame loader when the test run, there was a race in whether or not we
+        would dump the results before or after completing the script execution.
+
+        Fix this by restructuring the test to run during onload and by calling notifyDone()
+        after the file load attempt failed.
+
+        * editing/pasteboard/file-drag-to-editable-expected.txt:
+        * editing/pasteboard/script-tests/file-drag-to-editable.js:
+        (runTest.window.onbeforeunload): Simplify and don't run nofityDone yet.
+        (runTest): Run test during onload event.
+        * platform/chromium/TestExpectations: Remove flaky marker.
+
 2012-11-08  Erik Arvidsson  <arv@chromium.org>
 

trunk/LayoutTests/editing/pasteboard/file-drag-to-editable-expected.txt

@@ -4 +4 @@
 
 
+PASS window.attemptedFileNavigation is true
 PASS successfullyParsed is true
 

trunk/LayoutTests/editing/pasteboard/script-tests/file-drag-to-editable.js

@@ -26 +26 @@
 {
     window.onbeforeunload = function() {
-        shouldBeTrue('successfullyParsed');
-        debug('<br /><span class="pass">TEST COMPLETE</span>');
+        window.attemptedFileNavigation = true;
 
         // Don't remove the editable node, since we want to make sure there no stray file URLs were
         // inserted during the drop.
-
-        testRunner.notifyDone();
-
-        window.onbeforeunload = null;
     };
     dragFilesOntoEditableArea(['DRTFakeFile']);
-    testFailed('The test should have resulted in navigation');
+
+    shouldBeTrue("window.attemptedFileNavigation");
+    finishJSTest();
 }
 
 var successfullyParsed = true;
 
-if (window.eventSender) {
-    runTest();
+if (window.eventSender && window.testRunner) {
+    window.jsTestIsAsync = true;
+
+    window.onload = runTest;
 } else {
     testFailed('This test is not interactive, please run using DumpRenderTree');

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -4075 +4075 @@
 webkit.org/b/101093 [ Mac ] fast/sub-pixel/float-wrap-zoom.html [ ImageOnlyFailure ]
 
-# Flaky since r133069
-webkit.org/b/101092 [ Mac Win Debug ] editing/pasteboard/file-drag-to-editable.html [ Failure Pass ]
-
 # Crashy since at least r133035; gives a v8 error
 webkit.org/b/101099 [ Linux Debug ] fast/files/workers/worker-apply-blob-url-to-xhr.html [ Crash Pass ]