Switch grandfathering layout test to trigger on data record scanning instead of data...

https://bugs.webkit.org/show_bug.cgi?id=181482
<rdar://problem/36549026>

Unreviewed test gardening.

* http/tests/resourceLoadStatistics/grandfathering.html:
    Switched from
    testRunner.installStatisticsDidModifyDataRecordsCallback()
    to
    testRunner.installStatisticsDidScanDataRecordsCallback().
* platform/mac-wk2/TestExpectations:
    Marked as [ Pass ] again.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 96697c4..2a38ba8 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2018-01-29  John Wilander  <wilander@apple.com>
+
+        Switch grandfathering layout test to trigger on data record scanning instead of data record modification
+        https://bugs.webkit.org/show_bug.cgi?id=181482
+        <rdar://problem/36549026>
+
+        Unreviewed test gardening.
+
+        * http/tests/resourceLoadStatistics/grandfathering.html:
+            Switched from
+            testRunner.installStatisticsDidModifyDataRecordsCallback()
+            to
+            testRunner.installStatisticsDidScanDataRecordsCallback().
+        * platform/mac-wk2/TestExpectations:
+            Marked as [ Pass ] again.
+
 2018-01-29  Andy Estes  <aestes@apple.com>
 
         [iOS] Restrict synthetic clicks to the origin that handled the underlying touch event

diff --git a/LayoutTests/http/tests/resourceLoadStatistics/grandfathering.html b/LayoutTests/http/tests/resourceLoadStatistics/grandfathering.html
index e91000e..4acd22b 100644 (file)
--- a/LayoutTests/http/tests/resourceLoadStatistics/grandfathering.html
+++ b/LayoutTests/http/tests/resourceLoadStatistics/grandfathering.html
@@ -33,7 +33,7 @@
     }
 
     function fireDataModificationHandlerAndContinue() {
-        testRunner.installStatisticsDidModifyDataRecordsCallback(function() {
+        testRunner.installStatisticsDidScanDataRecordsCallback(function() {
             runTest();
         });
         testRunner.statisticsProcessStatisticsAndDataRecords();

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
index 3acb659..8876cdb 100644 (file)
--- a/LayoutTests/platform/mac-wk2/TestExpectations
+++ b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -875,7 +875,7 @@ webkit.org/b/181839 [ Debug ] inspector/debugger/breakpoint-action-log.html [ Pa
 
 webkit.org/b/181753 [ HighSierra Release ] http/wpt/service-workers/update-service-worker.https.html [ Pass Failure ]
 
-webkit.org/b/181482 http/tests/resourceLoadStatistics/grandfathering.html [ Skip ]
+webkit.org/b/181482 http/tests/resourceLoadStatistics/grandfathering.html [ Pass ]
 
 webkit.org/b/181831 [ HighSierra ] fast/forms/searchfield-heights.html [ Pass Failure ]