Attachment 372814 Details for Bug 199180 – Patch

[patch] Patch

bug-199180-20190624185636.patch (text/plain), 6.25 KB, created by John Wilander on 2019-06-24 18:56:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Wilander

Created: 2019-06-24 18:56:36 PDT

Size: 6.25 KB

patch

obsolete

>Subversion Revision: 246780
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 2a5c7764dbe23ab30eeeae4006483f976cb094cb..e195ba8f83022d4f7d31d2e61ed5cdd73f5b3a3c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-24  John Wilander  <wilander@apple.com>
>+
>+        Migrate LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store* test cases to setEnableFeature() and jsTestIsAsync
>+        https://bugs.webkit.org/show_bug.cgi?id=199180
>+        <rdar://problem/52085369>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt:
>+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt:
>+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html:
>+        * http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html:
>+
> 2019-06-24  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r246725 ): Crashes on twitch.tv
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt
>index 15e3ce063ddda2e280c8e77b0451584f8f0360cc..bae0033ffccaec263a96f2b3d783edcf704083d3 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-expected.txt
>@@ -1,6 +1,11 @@
>-PASS successfullyParsed is true
>+Tests clearing of website data store.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
> 
>-TEST COMPLETE
> PASS Host classified as prevalent resource.
> PASS Host is no longer a prevalent resource after the store was cleared.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
> 
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt
>index 15e3ce063ddda2e280c8e77b0451584f8f0360cc..07f999c6feb3265deff3951ac2f8140ac1a6eee0 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour-expected.txt
>@@ -1,6 +1,11 @@
>-PASS successfullyParsed is true
>+Tests clearing of website data store (one hour).
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
> 
>-TEST COMPLETE
> PASS Host classified as prevalent resource.
> PASS Host is no longer a prevalent resource after the store was cleared.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
> 
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
>index 4d123c03d120adde07b137cf6c244f7aea4dbbd4..9f16717e817c343be9f34f1f62f08a4aca6f6e06 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
>@@ -2,11 +2,15 @@
> <html lang="en">
> <head>
>     <meta charset="UTF-8">
>-    <title>Test Cleared Store</title>
>+    <title></title>
>     <script src="/js-test-resources/js-test.js"></script>
>+    <script src="resources/util.js"></script>
> </head>
> <body>
> <script>
>+    description("Tests clearing of website data store (one hour).");
>+    jsTestIsAsync = true;
>+
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
>     const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
>@@ -19,10 +23,7 @@
>         else
>             testPassed("Host is no longer a prevalent resource after the store was cleared.");
> 
>-        internals.setResourceLoadStatisticsEnabled(false);
>-        testRunner.statisticsResetToConsistentState(function() {
>-            testRunner.notifyDone();
>-        });
>+        setEnableFeature(false, finishJSTest);
>     }
> 
>     function testStep2() {
>@@ -55,9 +56,9 @@
>     }
> 
>     if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
>-        testRunner.waitUntilDone();
>-        internals.setResourceLoadStatisticsEnabled(true);
>-        runTestRunnerTest();
>+        setEnableFeature(true, function () {
>+            runTestRunnerTest();
>+        });
>     }
> </script>
> </body>
>diff --git a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html
>index 452f6e5bf5ee5a8a19a7f83cbdcbf3000f88b482..702741a1ba76e347d7c55416a451bb757ad8e6cb 100644
>--- a/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html
>+++ b/LayoutTests/http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html
>@@ -4,9 +4,13 @@
>     <meta charset="UTF-8">
>     <title>Test Cleared Store</title>
>     <script src="/js-test-resources/js-test.js"></script>
>+    <script src="resources/util.js"></script>
> </head>
> <body>
> <script>
>+    description("Tests clearing of website data store.");
>+    jsTestIsAsync = true;
>+
>     const hostUnderTest = "127.0.0.1:8000";
>     const statisticsUrl = "http://" + hostUnderTest + "/temp";
>     const topFrameOrigin1 = "http://127.0.0.2:8000/temp";
>@@ -28,10 +32,7 @@
>         else
>             testPassed("Host is no longer a prevalent resource after the store was cleared.");
> 
>-        internals.setResourceLoadStatisticsEnabled(false);
>-        testRunner.statisticsResetToConsistentState(function() {
>-            testRunner.notifyDone();
>-        });
>+        setEnableFeature(false, finishJSTest);
>     }
> 
>     function runTestRunnerTest() {
>@@ -56,9 +57,9 @@
>     }
> 
>     if (document.location.host === hostUnderTest && window.testRunner && window.internals) {
>-        testRunner.waitUntilDone();
>-        internals.setResourceLoadStatisticsEnabled(true);
>-        runTestRunnerTest();
>+        setEnableFeature(true, function () {
>+            runTestRunnerTest();
>+        });
>     }
> </script>
> </body>

Actions: View | Formatted Diff | Diff

Attachments on bug 199180: 372814