Changeset 122758 in webkit

Timestamp:

Jul 16, 2012 1:48:40 PM (12 years ago)

Author:

scheib@chromium.org

Message:

Fix Layout Test pointer-lock/locked-element-removed-from-dom.html flakiness.
​https://bugs.webkit.org/show_bug.cgi?id=91373

Reviewed by Adrienne Walker.

pointer-lock-test-harness corrected to no longer silently allow too many
asynchronous doNextStep calls in a test. The locked-element-removed-from-dom test
generated too many events and incorrectly exited the test early.

• platform/chromium/TestExpectations:

Re-enabled locked-element-removed-from-dom test.html

• pointer-lock/locked-element-removed-from-dom.html:

Absorb extra doNextStep.

• pointer-lock/resources/pointer-lock-test-harness.js:

(doNextStep.setTimeout):

Fail tests that call doNextStep too many times.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/TestExpectations (modified) (1 diff)
• pointer-lock/locked-element-removed-from-dom.html (modified) (1 diff)
• pointer-lock/resources/pointer-lock-test-harness.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-16  Vincent Scheib  <scheib@chromium.org>
+
+        Fix Layout Test pointer-lock/locked-element-removed-from-dom.html flakiness.
+        https://bugs.webkit.org/show_bug.cgi?id=91373
+
+        Reviewed by Adrienne Walker.
+
+        pointer-lock-test-harness corrected to no longer silently allow too many
+        asynchronous doNextStep calls in a test. The locked-element-removed-from-dom test
+        generated too many events and incorrectly exited the test early.
+
+        * platform/chromium/TestExpectations:
+            Re-enabled locked-element-removed-from-dom test.html
+        * pointer-lock/locked-element-removed-from-dom.html:
+            Absorb extra doNextStep.
+        * pointer-lock/resources/pointer-lock-test-harness.js:
+        (doNextStep.setTimeout):
+            Fail tests that call doNextStep too many times.
+
 2012-07-16  Florin Malita  <fmalita@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3729 +3729 @@
 BUGWK90980 WIN : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
 
-// Flaky since creation in 122626
-BUGWK91373 WIN : pointer-lock/locked-element-removed-from-dom.html = PASS TEXT
-
 // Started crashing after 122286
 BUGWK91133 WIN : storage/indexeddb/constants.html = PASS CRASH

trunk/LayoutTests/pointer-lock/locked-element-removed-from-dom.html

@@ -43 +43 @@
             // doNextStep called by event handler.
         },
+        function () {
+            // Absorb an extra doNextStep() from previous event handlers.
+        },
     ];
     doNextStep();

trunk/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js

@@ -13 +13 @@
         currentStep = 0;
 
-    if (currentStep < todo.length)
-        setTimeout(function () { todo[currentStep++](); }, 0);
-    else if (currentStep++ == todo.length)
-        setTimeout(function () { finishJSTest(); }, 0);
+    setTimeout(function () {
+        var thisStep = currentStep++;
+        if (thisStep < todo.length)
+            todo[thisStep]();
+        else if (thisStep == todo.length)
+            setTimeout(function () { finishJSTest(); }, 0); // Deferred so that excessive doNextStep calls will be observed.
+        else
+            testFailed("doNextStep called too many times.");
+    }, 0);
 }