Attachment 213579 Details for Bug 122414 – Patch

[patch] Patch

bug-122414-20131007161850.patch (text/plain), 4.88 KB, created by Grzegorz Czajkowski on 2013-10-07 07:18:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Czajkowski

Created: 2013-10-07 07:18:52 PDT

Size: 4.88 KB

patch

obsolete

>Subversion Revision: 157034
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 212a75b68920115f69b2ed527bca8b6945d73d72..660e987c2c191ca2bb647de93ebd9daa9bbca55d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,5 +1,29 @@
> 2013-10-07  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
> 
>+        context-menu-suggestions-multiword-selection.html and context-menu-suggestions-subword-selection.html are flaky after r156901
>+        https://bugs.webkit.org/show_bug.cgi?id=122414
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        On Mac, first call of 'initSpellTest' from spelling/resources/util.js
>+        often fails while checking spelling marker.
>+        Use shouldBecomeDifferent instead of calling timers in the tests.
>+        It should have been done at r156137 when shouldBecomeEqual/Different
>+        was used in asynchronous spell checking tests.
>+
>+        * editing/spelling/resources/util.js:
>+        Use shouldBecomeDifferent instead of timers.
>+
>+        * platform/mac/TestExpectations:
>+        Now context-menu-suggestions-multiword-selection.html and
>+        context-menu-suggestions-subword-selection.html are passing for Mac.
>+
>+        * resources/js-test-pre.js:
>+        (shouldBecomeDifferent):
>+        Add 'quiet' parameter to prevent outputting logs on success.
>+
>+2013-10-07  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
>+
>         context-menu-suggestions-multiword-selection.html and context-menu-suggestions-subword-selection.html are flaky after r156901.
>         https://bugs.webkit.org/show_bug.cgi?id=122414
> 
>diff --git a/LayoutTests/editing/spelling/resources/util.js b/LayoutTests/editing/spelling/resources/util.js
>index 693fa511fc71c214c76a18e11191a3925da9acf9..de778b33758f13299b84b75d547991e5a1561104 100644
>--- a/LayoutTests/editing/spelling/resources/util.js
>+++ b/LayoutTests/editing/spelling/resources/util.js
>@@ -3,21 +3,6 @@ function log(msg)
>     document.getElementById("console").innerHTML += (msg + "\n");
> }
> 
>-function verifySpellTest(nretry)
>-{
>-    if (!nretry) {
>-        log("FAIL Spellcheck timed out");
>-        finishJSTest()
>-        return;
>-    }
>-    if (!internals.markerCountForNode(destination.childNodes[0], "spelling")) {
>-        window.setTimeout(function() { verifySpellTest(nretry - 1); }, 0);
>-        return;
>-    }
>-    testFunctionCallback(destination.childNodes[0]);
>-    finishJSTest()
>-}
>-
> function initSpellTest(testElementId, testText, testFunction)
> {
>     if (!window.internals || !window.testRunner) {
>@@ -37,5 +22,8 @@ function initSpellTest(testElementId, testText, testFunction)
>     var destination = document.getElementById(testElementId);
>     destination.focus();
>     document.execCommand("InsertText", false, testText);
>-    window.setTimeout(function() { verifySpellTest(10); }, 0);
>+    shouldBecomeDifferent('internals.markerCountForNode(destination.childNodes[0], "spelling")', '0', function() {
>+        testFunctionCallback(destination.childNodes[0]);
>+        finishJSTest();
>+    }, true /* Doesn't produce logs on success. */ );
> }
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index e58a59467f0814d3634de21d4f1dfc35c050d9a6..7b56083580a5d3dc3c776b83740762ba2d2a5186 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -540,8 +540,6 @@ webkit.org/b/61630 fast/events/dropzone-005.html
> 
> # Spelling tests that are flakey.
> webkit.org/b/82555 editing/spelling/spellcheck-async-mutation.html [ Pass Failure ]
>-webkit.org/b/122414 editing/spelling/context-menu-suggestions-multiword-selection.html [ Pass Failure ]
>-webkit.org/b/122414 editing/spelling/context-menu-suggestions-subword-selection.html [ Pass Failure ]
> 
> webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding-shift-jis.html [ Failure ]
> webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding-utf-8.html [ Failure ]
>diff --git a/LayoutTests/resources/js-test-pre.js b/LayoutTests/resources/js-test-pre.js
>index e974243b7192e190d1a88b4fa256c33586805ae7..a3867da4e4478ed43a08f99df57d99e58d493b4d 100644
>--- a/LayoutTests/resources/js-test-pre.js
>+++ b/LayoutTests/resources/js-test-pre.js
>@@ -385,7 +385,7 @@ function shouldNotBe(_a, _b, quiet)
>     testFailed(_a + " should not be " + _bv + ".");
> }
> 
>-function shouldBecomeDifferent(_a, _b, completionHandler)
>+function shouldBecomeDifferent(_a, _b, completionHandler, quiet)
> {
>   if (typeof _a != "string" || typeof _b != "string")
>     debug("WARN: shouldBecomeDifferent() expects string arguments");
>@@ -402,7 +402,8 @@ function shouldBecomeDifferent(_a, _b, completionHandler)
>     if (exception)
>       testFailed(_a + " should became not equal to " + _bv + ". Threw exception " + exception);
>     if (!isResultCorrect(_av, _bv)) {
>-      testPassed(_a + " became different from " + _b);
>+      if (!quiet)
>+        testPassed(_a + " became different from " + _b);
>       return true;
>     }
>     return false;

Flags:

rniwa: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 122414: 213579