Attachment 339952 Details for Bug 184061 – Patch

[patch] Patch

bug-184061-20180509132057.patch (text/plain), 5.41 KB, created by youenn fablet on 2018-05-09 04:20:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-05-09 04:20:58 PDT

Size: 5.41 KB

patch

obsolete

>Subversion Revision: 231437
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 295fa494232fe728c251446d04c90236690058f0..82218f3851760b60497cee6ab93510bb38ebad4b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-05-09  Youenn Fablet  <youenn@apple.com>
>+
>+        REGRESSION (r229831?): Layout Test http/tests/appcache/interrupted-update.html is a flaky failure
>+        https://bugs.webkit.org/show_bug.cgi?id=184061
>+        <rdar://problem/38975570>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test is flaky as it sometimes reload twice.
>+        Make sure it reloads only once by not relying on localStorage.
>+        Make sure the appcache has not enough time to finish before reloading is done.
>+        This is done by adding more entries to the appcache.
>+        Add a test that sets an item in local storage, reloads and verifies the item is there.
>+
>+        * TestExpectations:
>+        * http/tests/appcache/interrupted-update.html:
>+        * http/tests/appcache/resources/interrupted-update.manifest:
>+        * http/tests/storage/setItem-and-reload-expected.txt: Added.
>+        * http/tests/storage/setItem-and-reload.html: Added.
>+
> 2018-05-09  Youenn Fablet  <youenn@apple.com>
> 
>         Unflake some additional AppCache tests
>diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
>index 484e6e45a8d61056da16952afdf7f2f2a176a11e..ab79b09fd7f894923b55d97a7425c8c68f50892c 100644
>--- a/LayoutTests/TestExpectations
>+++ b/LayoutTests/TestExpectations
>@@ -1898,8 +1898,6 @@ webkit.org/b/184198 imported/w3c/web-platform-tests/html/browsers/offline/appcac
> 
> webkit.org/b/184058 storage/indexeddb/dont-wedge-private.html [ Pass Failure ]
> 
>-webkit.org/b/184061 http/tests/appcache/interrupted-update.html [ Pass Failure ]
>-
> webkit.org/b/184453 imported/w3c/web-platform-tests/workers/name-property.html [ Pass Failure ]
> 
> webkit.org/b/48451 animations/combo-transform-translate+scale.html [ Pass Failure ]
>diff --git a/LayoutTests/http/tests/appcache/interrupted-update.html b/LayoutTests/http/tests/appcache/interrupted-update.html
>index 6576be3ade201a71da68ec33fdfb1d2a0519e7a1..1f5e86a966723f0636cf9cf21fd7c8584322450e 100644
>--- a/LayoutTests/http/tests/appcache/interrupted-update.html
>+++ b/LayoutTests/http/tests/appcache/interrupted-update.html
>@@ -12,8 +12,7 @@ function log(msg)
>     document.getElementById("log").innerHTML += msg + "\n";
> }
> 
>-var haveReloaded = localStorage.getItem("appcache-interrupted-update-reloaded") == "YES";
>-localStorage.removeItem("appcache-interrupted-update-reloaded");
>+var haveReloaded = window.location.hash === "#reloaded";
> 
> if (haveReloaded)
>     log("Reloaded");
>@@ -33,9 +32,9 @@ function onprogress(event)
>     log("PROGRESS " + event.loaded + "/" + event.total);
> 
>     if (!haveReloaded && event.loaded == 2) {
>-        localStorage.setItem("appcache-interrupted-update-reloaded", "YES");
>+        reloadedLocation = window.location + "#reloaded";
>+        window.location = "/resources/redirect.php?url=" + encodeURIComponent(reloadedLocation);
>         console.log("Reloading...");
>-        window.location.reload();
>     }
> }
> 
>diff --git a/LayoutTests/http/tests/appcache/resources/interrupted-update.manifest b/LayoutTests/http/tests/appcache/resources/interrupted-update.manifest
>index 682d0993231768726cb1c866c2031a941c354651..8b40378d71138d45fa38d585719e3261b3484072 100644
>--- a/LayoutTests/http/tests/appcache/resources/interrupted-update.manifest
>+++ b/LayoutTests/http/tests/appcache/resources/interrupted-update.manifest
>@@ -8,3 +8,13 @@ abe.png?interrupted-update-6
> abe.png?interrupted-update-7
> abe.png?interrupted-update-8
> abe.png?interrupted-update-9
>+abe.png?interrupted-update-10
>+abe.png?interrupted-update-11
>+abe.png?interrupted-update-12
>+abe.png?interrupted-update-13
>+abe.png?interrupted-update-14
>+abe.png?interrupted-update-15
>+abe.png?interrupted-update-16
>+abe.png?interrupted-update-17
>+abe.png?interrupted-update-18
>+abe.png?interrupted-update-19
>diff --git a/LayoutTests/http/tests/storage/setItem-and-reload-expected.txt b/LayoutTests/http/tests/storage/setItem-and-reload-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7cbdb772aba7abc18327fb8e4bebc638023ed6b8
>--- /dev/null
>+++ b/LayoutTests/http/tests/storage/setItem-and-reload-expected.txt
>@@ -0,0 +1,5 @@
>+CONSOLE MESSAGE: line 25: Reloading...
>+Test that setting local storage, reloading and getting local storage works.
>+
>+Reloaded
>+
>diff --git a/LayoutTests/http/tests/storage/setItem-and-reload.html b/LayoutTests/http/tests/storage/setItem-and-reload.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..678bc06ee003b4dcd85e770cdb69582258141cdb
>--- /dev/null
>+++ b/LayoutTests/http/tests/storage/setItem-and-reload.html
>@@ -0,0 +1,31 @@
>+<html>
>+<p>Test that setting local storage, reloading and getting local storage works.</p>
>+<pre id=log></pre>
>+<script>
>+if (window.testRunner) {
>+    testRunner.dumpAsText();
>+    testRunner.waitUntilDone();
>+}
>+
>+function log(msg)
>+{
>+    document.getElementById("log").innerHTML += msg + "\n";
>+}
>+
>+var haveReloaded = localStorage.getItem("reloaded") == "YES";
>+localStorage.removeItem("reloaded");
>+
>+if (haveReloaded) {
>+    log("Reloaded");
>+    if (window.testRunner)
>+        testRunner.notifyDone();
>+} else {
>+    setTimeout(() => {
>+        localStorage.setItem("reloaded", "YES");
>+        console.log("Reloading...");
>+        window.location.reload();
>+    }, 0);
>+}
>+</script>
>+
>+</html>

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 184061: 339952 | 339956 | 339957 | 339982