[DevTools] Reenable web_tests invalidated by frontend change

Frontend change: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2233229 made changes to NetworkLog. 37 web_tests are disabled by: https://chromium-review.googlesource.com/c/chromium/src/+/2245031 Bug: crbug.com/1094669 Change-Id: I6a8903ed4ceb1edffc737685ea9c0a680823246e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2245668 Commit-Queue: Songtao Xia <soxia@microsoft.com> Reviewed-by: John Emau <John.Emau@microsoft.com> Cr-Commit-Position: refs/heads/master@{#782788}
chromium · Jun 26, 2020 · 0324506 · 0324506
1 parent 651261c
commit 0324506
Show file tree

Hide file tree

Showing 41 changed files with 235 additions and 123 deletions.
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
@@ -6173,43 +6173,6 @@ crbug.com/1029489 http/tests/devtools/elements/elements-linkify-attributes.js [
 crbug.com/1029567 [ Debug ]crbug.com/1029521 virtual/threaded/external/wpt/web-animations/timing-model/animations/updating-the-finished-state.html [ Pass Failure Timeout ]
 crbug.com/1030258 http/tests/devtools/network/network-cookies-pane.js [ Pass Failure ]
 crbug.com/1041830 http/tests/devtools/tracing/timeline-js/timeline-js-line-level-profile.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/extra-info-redirects.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-request-type.js [ Pass Failure Timeout ]
-crbug.com/1094669 http/tests/devtools/network/network-timing.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-xhr-redirect-method.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/subresource-integrity-number-of-requests-for-stylesheet.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/service-workers/service-workers-navigation-preload.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/sxg/sxg-navigation-fail.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/sxg/sxg-navigation-redirect.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/sxg/sxg-navigation.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/sxg/sxg-transfer-size.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/extensions/extensions-network-redirect.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/font-face.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/har-post.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-empty-xhr.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/sxg/sxg-cert-not-found.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-cachedresources-with-same-urls.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-content-replacement-xhr.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-cyrillic-xhr.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-initiator-from-console.js [ Pass Failure Timeout ]
-crbug.com/1094669 http/tests/devtools/network/network-log-service-worker-navigate.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-search.js [ Pass Failure Timeout ]
-crbug.com/1094669 http/tests/devtools/network/network-status-non-http.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-worker-fetch-blocked.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-worker-fetch-parallel.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-xsl-content.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/resource-har-conversion.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/service-workers/service-worker-network-fetch.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/extensions/extensions-network.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/failed-request-response-mimetype.js [ Pass Failure Timeout ]
-crbug.com/1094669 http/tests/devtools/network/network-disable-cache-xhrs.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-document-initiator.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-image-404.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-worker-fetch.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-xhr-async-double.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/network-xhr-redirect-body.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/network/subresource-integrity-number-of-requests-for-script.js [ Pass Failure ]
-crbug.com/1094669 http/tests/devtools/service-workers/service-worker-network-fetch-blocked.js [ Pass Failure Timeout ]
 
 # Enable scroll-snap tests on impl thread
 # These are currently failing on Mac which needs more investigation, snap-scrolls-visual-viewport seems flaky
@@ -6406,8 +6369,7 @@ crbug.com/1046784 http/tests/devtools/search/search-in-sourcemap.js [ Pass Timeo
 crbug.com/1046784 http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/animation/animation-after-navigation.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/search/search-in-script.js [ Pass Timeout ]
-# uncomment this after crbug.com/1094669
-# crbug.com/1046784 http/tests/devtools/service-workers/service-worker-network-fetch-blocked.js [ Pass Timeout ]
+crbug.com/1046784 http/tests/devtools/service-workers/service-worker-network-fetch-blocked.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/fragment.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/coverage/coverage-view.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/editor/text-editor-toggle-tab-moves-focus.js [ Pass Timeout ]
@@ -6428,15 +6390,13 @@ crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-3.js
 crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/editor/text-editor-code-folding.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/coverage/coverage-suspended.js [ Pass Timeout ]
-# uncomment this after crbug.com/1094669
-# crbug.com/1046784 http/tests/devtools/network/network-search.js [ Pass Timeout ]
+crbug.com/1046784 http/tests/devtools/network/network-search.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/components/linkifier.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/editor/text-editor-block-indent.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/elements/edit/set-outer-html.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/editor/text-editor-reveal-line.js [ Pass Timeout ]
-# uncomment this after crbug.com/1094669
-# crbug.com/1046784 http/tests/devtools/network/failed-request-response-mimetype.js [ Pass Timeout ]
+crbug.com/1046784 http/tests/devtools/network/failed-request-response-mimetype.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/elements/selected-element-changes-execution-context.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/editor/text-editor-auto-whitespace-removing.js [ Pass Timeout ]
 crbug.com/1046784 http/tests/devtools/filtered-item-selection-dialog-rendering.js [ Pass Timeout ]

diff --git a/third_party/blink/web_tests/http/tests/devtools/extensions/extensions-network-redirect.js b/third_party/blink/web_tests/http/tests/devtools/extensions/extensions-network-redirect.js
@@ -52,11 +52,12 @@
           {
               var entries = har.entries;
               var urls = [];
-              for (var i = 0; i < entries.length; ++i) {
-                  var url = entries[i].request.url;
-                  // Workaround for GTK DRT that requests favicon.ico along with the page.
-                  if (!/\/favicon\.ico$/.test(url))
-                      urls.push(url);
+              for (var i = 0; i < entries.length; i += 2) {
+                var url = entries[i].request.url;
+                // Workaround for GTK DRT that requests favicon.ico along with
+                // the page.
+                if (!/\/favicon\.ico$/.test(url))
+                  urls.push(url);
               }
               urls.sort();
               output("Requests in HAR:\n" + urls.join("\n"));

diff --git a/third_party/blink/web_tests/http/tests/devtools/extensions/extensions-network.js b/third_party/blink/web_tests/http/tests/devtools/extensions/extensions-network.js
@@ -15,8 +15,8 @@
       function onHAR(result) {
         result.entries.sort(compareEntries);
 
-        for (var i = 0; i < result.entries.length; ++i)
-            output("resource: " + result.entries[i].request.url);
+        for (var i = 0; i < result.entries.length; i += 2)
+          output('resource: ' + result.entries[i].request.url);
       }
       extension_doXHR(function() {
         webInspector.network.getHAR(callbackAndNextTest(onHAR, nextTest));

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/extra-info-redirects.js b/third_party/blink/web_tests/http/tests/devtools/network/extra-info-redirects.js
@@ -19,16 +19,18 @@ new Promise(resolve => {
 });
 `);
 
-  const reqs = SDK.NetworkLog.instance().requests().map(request => {
-    return {
-      url: request.url(),
-      hasExtraRequestInfo: request.hasExtraRequestInfo(),
-      hasExtraResponseInfo: request.hasExtraResponseInfo(),
-      requestHostHeader: request.requestHeaderValue('host'),
-      responseXDevToolsRedirectHeader:
-          request.responseHeaderValue('x-devtools-redirect')
-    };
-  });
+  const reqs = NetworkTestRunner.networkRequests()
+                   .filter((e, i, a) => i % 2 == 0)
+                   .map(request => {
+                     return {
+                       url: request.url(),
+                       hasExtraRequestInfo: request.hasExtraRequestInfo(),
+                       hasExtraResponseInfo: request.hasExtraResponseInfo(),
+                       requestHostHeader: request.requestHeaderValue('host'),
+                       responseXDevToolsRedirectHeader:
+                           request.responseHeaderValue('x-devtools-redirect')
+                     };
+                   });
   TestRunner.addResult(JSON.stringify(reqs, null, 2));
   TestRunner.completeTest();
 })();
diff --git a/third_party/blink/web_tests/http/tests/devtools/network/failed-request-response-mimetype.js b/third_party/blink/web_tests/http/tests/devtools/network/failed-request-response-mimetype.js
@@ -12,7 +12,8 @@
   TestRunner.networkManager.addEventListener(
     SDK.NetworkManager.Events.RequestFinished, (event) => {
       const request = event.data;
-      const networkRequests = NetworkTestRunner.networkRequests();
+      const networkRequests =
+          NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
       const networkRequest = networkRequests[0];
 
       TestRunner.addResult('networkRequests.length: ' + networkRequests.length);

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/font-face.js b/third_party/blink/web_tests/http/tests/devtools/network/font-face.js
@@ -6,18 +6,28 @@
   TestRunner.addResult(`Tests that a used font-face is reported and an unused font-face is not reported.\n`);
   await TestRunner.showPanel('network');
 
+  function getRequestFromEvent(eventType, event) {
+    if (eventType === 'RequestStarted') {
+      return event.data.request;
+    } else {
+      return event.data;
+    }
+  }
+
   function onRequest(eventType, event) {
-    var request = event.data;
+    var request = getRequestFromEvent(eventType, event);
     if (request.name() === 'done') {
       TestRunner.completeTest();
       return;
     }
     TestRunner.addResult(eventType + ': ' + request.name());
   }
+
   TestRunner.networkManager.addEventListener(
       SDK.NetworkManager.Events.RequestStarted, onRequest.bind(null, 'RequestStarted'));
   TestRunner.networkManager.addEventListener(
-      SDK.NetworkManager.Events.RequestFinished, onRequest.bind(null, 'RequestFinished'));
+      SDK.NetworkManager.Events.RequestFinished,
+      onRequest.bind(null, 'RequestFinished'));
 
   await TestRunner.addIframe('resources/font-face.html');
 })();
diff --git a/third_party/blink/web_tests/http/tests/devtools/network/har-post.js b/third_party/blink/web_tests/http/tests/devtools/network/har-post.js
@@ -32,8 +32,9 @@
   const harString = await new Promise(async resolve => {
     const stream = new TestRunner.StringOutputStream(resolve);
     const progress = new Common.Progress();
-    await Network.HARWriter.write(
-        stream, NetworkTestRunner.networkRequests(), progress);
+    const networkRequests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
+    await Network.HARWriter.write(stream, networkRequests, progress);
     progress.done();
     stream.close();
   });

diff --git a/...rty/blink/web_tests/http/tests/devtools/network/network-cachedresources-with-same-urls.js b/...rty/blink/web_tests/http/tests/devtools/network/network-cachedresources-with-same-urls.js
@@ -38,7 +38,8 @@
   async function step2(msg) {
     // inspector-test.js appears in network panel occasionally in Safari on
     // Mac, so checking two last requests.
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     var request1 = requests[requests.length - 2];
     var request2 = requests[requests.length - 1];
 

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-content-replacement-xhr.js b/third_party/blink/web_tests/http/tests/devtools/network/network-content-replacement-xhr.js
@@ -41,22 +41,26 @@
   }
 
   function step1() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 4], step2);
   }
 
   function step2() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 3], step3);
   }
 
   function step3() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 2], step4);
   }
 
   function step4() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 1], step5);
   }
 

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-cyrillic-xhr.js b/third_party/blink/web_tests/http/tests/devtools/network/network-cyrillic-xhr.js
@@ -29,12 +29,14 @@
   }
 
   function step2() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 2], step3);
   }
 
   function step3() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     dumpRequest(requests[requests.length - 1], step4);
   }
 

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-disable-cache-xhrs.js b/third_party/blink/web_tests/http/tests/devtools/network/network-disable-cache-xhrs.js
@@ -25,7 +25,8 @@
   async function step4(msg) {
     // inspector-test.js appears in network panel occasionally in Safari on
     // Mac, so checking two last resources.
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     var request1 = requests[requests.length - 3];
     var request2 = requests[requests.length - 2];
     var request3 = requests[requests.length - 1];

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-document-initiator.js b/third_party/blink/web_tests/http/tests/devtools/network/network-document-initiator.js
@@ -29,7 +29,8 @@
   }
 
   function step1() {
-    var results = NetworkTestRunner.findRequestsByURLPattern(/\?foo/);
+    var results = NetworkTestRunner.findRequestsByURLPattern(/\?foo/).filter(
+        (e, i, a) => i % 2 == 0);
     TestRunner.assertEquals(1, results.length);
     dumpInitiator(results[0]);
     TestRunner.completeTest();

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-empty-xhr.js b/third_party/blink/web_tests/http/tests/devtools/network/network-empty-xhr.js
@@ -29,13 +29,15 @@
   }
 
   function step2() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     var request = requests[requests.length - 2];
     dumpRequest(request, step3);
   }
 
   function step3() {
-    var requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     var request = requests[requests.length - 1];
     dumpRequest(request, step4);
   }

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-image-404.js b/third_party/blink/web_tests/http/tests/devtools/network/network-image-404.js
@@ -35,7 +35,8 @@
   }
 
   async function step3() {
-    const requests = NetworkTestRunner.networkRequests();
+    var requests =
+        NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
     requests.sort(function(a, b) {
       return a.url().localeCompare(b.url());
     });

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-initiator-from-console.js b/third_party/blink/web_tests/http/tests/devtools/network/network-initiator-from-console.js
@@ -19,7 +19,7 @@
   }
 
   function onRequest(event) {
-    var request = event.data;
+    var request = event.data.request;
     if (/silent_script.js/.test(request.url()))
       step2();
   }

diff --git a/..._party/blink/web_tests/http/tests/devtools/network/network-log-service-worker-navigate.js b/..._party/blink/web_tests/http/tests/devtools/network/network-log-service-worker-navigate.js
@@ -15,7 +15,9 @@
   await TestRunner.reloadPagePromise();
   TestRunner.addResult('');
 
-  for (const request of SDK.NetworkLog.instance().requests()) {
+  const requests =
+      NetworkTestRunner.networkRequests().filter((e, i, a) => i % 2 == 0);
+  for (const request of requests) {
     const networkManager = SDK.NetworkManager.forRequest(request);
     TestRunner.addResult('request.url(): ' + request.url());
     TestRunner.addResult(

diff --git a/third_party/blink/web_tests/http/tests/devtools/network/network-request-type.js b/third_party/blink/web_tests/http/tests/devtools/network/network-request-type.js
@@ -38,7 +38,7 @@
   }
 
   function onRequest(event) {
-    var request = event.data;
+    var request = event.data.request;
     if (request.name() !== requestName)
       return;
     requestName = undefined;