Attachment 152590 Details for Bug 91373 – Patch for landing

[patch] Patch for landing

bug-91373-20120716124720.patch (text/plain), 3.77 KB, created by Vincent Scheib on 2012-07-16 12:47:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent Scheib

Created: 2012-07-16 12:47:20 PDT

Size: 3.77 KB

patch

obsolete

>Subversion Revision: 122749
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 399b871ea32aa52eaf56b727d23d5022ee8382fa..7735315bf42b87b15c03c3a60cfacd87452cd765 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,22 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Ojan Vafai  <ojan@chromium.org>
> 
>         Cleanup a bunch of invalid BUG* lines. Rebaseline tests that were straightfoward
>diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
>index e095248ecd5d069c0d1af44872afd05ff29102b0..a1b04b2c80e6c5c26d7e88e6d3e5df049b91b332 100644
>--- a/LayoutTests/platform/chromium/TestExpectations
>+++ b/LayoutTests/platform/chromium/TestExpectations
>@@ -3726,9 +3726,6 @@ BUGWK90900 MAC : tables/mozilla_expected_failures/other/empty_cells.html = PASS
> BUGWK90980 LINUX MAC DEBUG : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
> 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
> 
>diff --git a/LayoutTests/pointer-lock/locked-element-removed-from-dom.html b/LayoutTests/pointer-lock/locked-element-removed-from-dom.html
>index d71b8cede0fc8671f03dd419de91d4bd3a9e1a67..8fda65ff3036fea5fb9fe85e4b8f2aed8429348e 100644
>--- a/LayoutTests/pointer-lock/locked-element-removed-from-dom.html
>+++ b/LayoutTests/pointer-lock/locked-element-removed-from-dom.html
>@@ -42,6 +42,9 @@
>             shouldBe("targetDiv1.parentElement.parentElement", "null");
>             // doNextStep called by event handler.
>         },
>+        function () {
>+            // Absorb an extra doNextStep() from previous event handlers.
>+        },
>     ];
>     doNextStep();
> </script>
>diff --git a/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js b/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js
>index 48a1be5b87244919606c4dee8cbf29c080a05e82..6368420d54926eea3eb38acfb2a687786404434e 100644
>--- a/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js
>+++ b/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js
>@@ -12,10 +12,15 @@ function doNextStep()
>     if (typeof(currentStep) == "undefined")
>         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);
> }
> 
> function doNextStepWithUserGesture()

Actions: View | Formatted Diff | Diff

Attachments on bug 91373: 152588 | 152589 | 152590 | 152591