Bug 1341308 - Fix network stub check test intermittent. r=bgrins draft
authorNicolas Chevobbe <nchevobbe@mozilla.com>
Mon, 12 Jun 2017 09:18:51 +0200
changeset 594835 aebcfeadc4c54653a2e5c6fd89793072a31cb91f
parent 594071 45fde181a497a187d01d5412f5b72897c7520517
child 633542 6c7c9cd4517265dd96dcf890ec80089af0d3db5c
push id64159
push userbmo:nchevobbe@mozilla.com
push dateThu, 15 Jun 2017 15:02:57 +0000
reviewersbgrins
bugs1341308
milestone56.0a1
Bug 1341308 - Fix network stub check test intermittent. r=bgrins In the console, we were assuming that eventTiming was the last of the eight networkUpdate that happen for a given network request. Unfortunately, we can't ensure the order in which those updates come, so the test was intermitently failing when eventTiming was fired before other updates. To fix this, we don't look for a specific update, but rather check that all of the 8 updates happened. MozReview-Commit-ID: Iv0TIHoqkyv
devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html
devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
devtools/client/webconsole/new-console-output/test/store/messages.test.js
--- a/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
+++ b/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
@@ -179,19 +179,21 @@ NewConsoleOutputWrapper.prototype = {
     store.dispatch(actions.messagesClear());
   },
 
   dispatchTimestampsToggle: function (enabled) {
     store.dispatch(actions.timestampsToggle(enabled));
   },
 
   dispatchMessageUpdate: function (message, res) {
-    // network-message-updated will emit when eventTimings message arrives
-    // which is the last one of 8 updates happening on network message update.
-    if (res.packet.updateType === "eventTimings") {
+    // network-message-updated will emit when all the update message arrives.
+    // Since we can't ensure the order of the network update, we check
+    // that networkInfo.updates has all we need.
+    const NUMBER_OF_NETWORK_UPDATE = 8;
+    if (res.networkInfo.updates.length === NUMBER_OF_NETWORK_UPDATE) {
       batchedMessageAdd(actions.networkMessageUpdate(message));
       this.jsterm.hud.emit("network-message-updated", res);
     }
   },
 
   // Should be used for test purpose only.
   getStore: function () {
     return store;
--- a/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
+++ b/devtools/client/webconsole/new-console-output/test/components/network-event-message.test.js
@@ -19,17 +19,17 @@ const serviceContainer = require("devtoo
 
 const EXPECTED_URL = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html";
 const EXPECTED_STATUS = /\[HTTP\/\d\.\d \d+ [A-Za-z ]+ \d+ms\]/;
 
 describe("NetworkEventMessage component:", () => {
   describe("GET request", () => {
     it("renders as expected", () => {
       const message = stubPreparedMessages.get("GET request");
-      const update = stubPreparedMessages.get("GET request eventTimings");
+      const update = stubPreparedMessages.get("GET request update");
       const wrapper = render(NetworkEventMessage({
         message,
         serviceContainer,
         timestampsVisible: true,
         networkMessageUpdate: update,
       }));
       const { timestampString } = require("devtools/client/webconsole/webconsole-l10n");
 
@@ -38,17 +38,17 @@ describe("NetworkEventMessage component:
       expect(wrapper.find(".message-body .xhr").length).toBe(0);
       expect(wrapper.find(".message-body .url").length).toBe(1);
       expect(wrapper.find(".message-body .url").text()).toBe(EXPECTED_URL);
       expect(wrapper.find(".message-body .status").length).toBe(1);
       expect(wrapper.find(".message-body .status").text()).toMatch(EXPECTED_STATUS);
     });
 
     it("does not have a timestamp when timestampsVisible prop is falsy", () => {
-      const message = stubPreparedMessages.get("GET request eventTimings");
+      const message = stubPreparedMessages.get("GET request update");
       const wrapper = render(NetworkEventMessage({
         message,
         serviceContainer,
         timestampsVisible: false,
       }));
 
       expect(wrapper.find(".timestamp").length).toBe(0);
     });
@@ -64,17 +64,17 @@ describe("NetworkEventMessage component:
       wrapper = render(NetworkEventMessage({ message, serviceContainer }));
       expect(wrapper.find(".indent").prop("style").width).toBe(`0`);
     });
   });
 
   describe("XHR GET request", () => {
     it("renders as expected", () => {
       const message = stubPreparedMessages.get("XHR GET request");
-      const update = stubPreparedMessages.get("XHR GET request eventTimings");
+      const update = stubPreparedMessages.get("XHR GET request update");
       const wrapper = render(NetworkEventMessage({
         message,
         serviceContainer,
         networkMessageUpdate: update,
       }));
 
       expect(wrapper.find(".message-body .method").text()).toBe("GET");
       expect(wrapper.find(".message-body .xhr").length).toBe(1);
@@ -82,17 +82,17 @@ describe("NetworkEventMessage component:
       expect(wrapper.find(".message-body .url").text()).toBe(EXPECTED_URL);
       expect(wrapper.find(".message-body .status").text()).toMatch(EXPECTED_STATUS);
     });
   });
 
   describe("XHR POST request", () => {
     it("renders as expected", () => {
       const message = stubPreparedMessages.get("XHR POST request");
-      const update = stubPreparedMessages.get("XHR POST request eventTimings");
+      const update = stubPreparedMessages.get("XHR POST request update");
       const wrapper = render(NetworkEventMessage({
         message,
         serviceContainer,
         networkMessageUpdate: update,
       }));
 
       expect(wrapper.find(".message-body .method").text()).toBe("POST");
       expect(wrapper.find(".message-body .xhr").length).toBe(1);
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/browser_webconsole_check_stubs_network_event.js
@@ -8,16 +8,17 @@
 Cu.import("resource://gre/modules/osfile.jsm", {});
 
 add_task(function* () {
   let generatedStubs = yield generateNetworkEventStubs();
 
   let repoStubFilePath = getTestFilePath("../stubs/networkEvent.js");
   let repoStubFileContent = yield OS.File.read(repoStubFilePath, { encoding: "utf-8" });
 
+  is(generatedStubs, repoStubFileContent, "Generated stub has the expected content");
   if (generatedStubs != repoStubFileContent) {
     ok(false, "The networkEvent stubs file needs to be updated by running " +
       "`mach test devtools/client/webconsole/new-console-output/test/fixtures/" +
       "stub-generators/browser_webconsole_update_stubs_network_event.js`");
   } else {
     ok(true, "The networkEvent stubs file is up to date");
   }
 });
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/head.js
@@ -156,22 +156,24 @@ function getCleanedPacket(key, packet) {
         typeof res.pageError.errorMessage === "object"
         && res.pageError.errorMessage.type === "longString"
       ) {
         res.pageError.errorMessage.actor = existingPacket.pageError.errorMessage.actor;
       }
     }
 
     if (res.packet) {
-      if (res.packet.totalTime) {
-        // res.packet.totalTime is read-only so we use assign to override it.
-        res.packet = Object.assign({}, existingPacket.packet, {
-          totalTime: existingPacket.packet.totalTime
-        });
-      }
+      let override = {};
+      let keys = ["totalTime", "from", "contentSize", "transferredSize"];
+      keys.forEach(x => {
+        if (res.packet[x] !== undefined) {
+          override[x] = existingPacket.packet[key];
+        }
+      });
+      res.packet = Object.assign({}, res.packet, override);
     }
 
     if (res.networkInfo) {
       if (res.networkInfo.timeStamp) {
         res.networkInfo.timeStamp = existingPacket.networkInfo.timeStamp;
       }
 
       if (res.networkInfo.startedDateTime) {
@@ -186,20 +188,34 @@ function getCleanedPacket(key, packet) {
         res.networkInfo.actor = existingPacket.networkInfo.actor;
       }
 
       if (res.networkInfo.request && res.networkInfo.request.headersSize) {
         res.networkInfo.request.headersSize =
           existingPacket.networkInfo.request.headersSize;
       }
 
-      if (res.networkInfo.response && res.networkInfo.response.headersSize) {
+      if (
+        res.networkInfo.response
+        && res.networkInfo.response.headersSize !== undefined
+      ) {
         res.networkInfo.response.headersSize =
           existingPacket.networkInfo.response.headersSize;
       }
+      if (res.networkInfo.response && res.networkInfo.response.bodySize !== undefined) {
+        res.networkInfo.response.bodySize =
+          existingPacket.networkInfo.response.bodySize;
+      }
+      if (
+        res.networkInfo.response
+        && res.networkInfo.response.transferredSize !== undefined
+      ) {
+        res.networkInfo.response.transferredSize =
+          existingPacket.networkInfo.response.transferredSize;
+      }
     }
   } else {
     res = packet;
   }
 
   cachedPackets[key] = res;
   return res;
 }
@@ -389,18 +405,31 @@ function* generateNetworkEventStubs() {
           resolve();
         }
       });
     });
 
     let onNetworkUpdate = new Promise(resolve => {
       let i = 0;
       ui.jsterm.hud.on("network-message-updated", function onNetworkUpdated(event, res) {
-        let updateKey = `${keys[i++]} ${res.packet.updateType}`;
-        stubs.packets.push(formatPacket(updateKey, res));
+        let updateKey = `${keys[i++]} update`;
+        // We cannot ensure the form of the network update packet, some properties
+        // might be in another order than in the original packet.
+        // Hand-picking only what we need should prevent this.
+        const packet = {
+          networkInfo: {
+            _type: res.networkInfo._type,
+            actor: res.networkInfo.actor,
+            request: res.networkInfo.request,
+            response: res.networkInfo.response,
+            totalTime: res.networkInfo.totalTime,
+          }
+        };
+
+        stubs.packets.push(formatPacket(updateKey, packet));
         stubs.preparedMessages.push(formatNetworkEventStub(updateKey, res));
         if (i === keys.length) {
           ui.jsterm.hud.off("network-message-updated", onNetworkUpdated);
           resolve();
         }
       });
     });
 
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
     <title>Stub generator for network event</title>
   </head>
   <body>
     <p>Stub generator for network event</p>
   </body>
 </html>
--- a/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/stubs/networkEvent.js
@@ -25,39 +25,42 @@ stubPreparedMessages.set("GET request", 
   "response": {},
   "source": "network",
   "type": "log",
   "groupId": null,
   "timeStamp": 1487022056850,
   "indent": 0
 }));
 
-stubPreparedMessages.set("GET request eventTimings", new NetworkEventMessage({
+stubPreparedMessages.set("GET request update", new NetworkEventMessage({
   "id": "1",
   "actor": "server1.conn0.child1/netEvent30",
   "level": "log",
-  "isXHR": false,
   "request": {
     "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
     "method": "GET",
     "headersSize": 489
   },
   "response": {
     "httpVersion": "HTTP/1.1",
     "status": "404",
     "statusText": "Not Found",
     "headersSize": 160,
     "remoteAddress": "127.0.0.1",
-    "remotePort": 8888
+    "remotePort": 8888,
+    "content": {
+      "mimeType": "text/html; charset=utf-8"
+    },
+    "bodySize": 904,
+    "transferredSize": 904
   },
   "source": "network",
   "type": "log",
   "groupId": null,
-  "timeStamp": 1486927175277,
-  "totalTime": 23,
+  "totalTime": 16,
   "indent": 0
 }));
 
 stubPreparedMessages.set("XHR GET request", new NetworkEventMessage({
   "id": "1",
   "actor": "server1.conn1.child1/netEvent30",
   "level": "log",
   "isXHR": true,
@@ -68,39 +71,42 @@ stubPreparedMessages.set("XHR GET reques
   "response": {},
   "source": "network",
   "type": "log",
   "groupId": null,
   "timeStamp": 1487022057746,
   "indent": 0
 }));
 
-stubPreparedMessages.set("XHR GET request eventTimings", new NetworkEventMessage({
+stubPreparedMessages.set("XHR GET request update", new NetworkEventMessage({
   "id": "1",
-  "actor": "server1.conn1.child1/netEvent30",
+  "actor": "server1.conn0.child1/netEvent31",
   "level": "log",
-  "isXHR": true,
   "request": {
     "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
     "method": "GET",
     "headersSize": 489
   },
   "response": {
     "httpVersion": "HTTP/1.1",
     "status": "404",
     "statusText": "Not Found",
     "headersSize": 160,
     "remoteAddress": "127.0.0.1",
-    "remotePort": 8888
+    "remotePort": 8888,
+    "content": {
+      "mimeType": "text/html; charset=utf-8"
+    },
+    "bodySize": 904,
+    "transferredSize": 904
   },
   "source": "network",
   "type": "log",
   "groupId": null,
-  "timeStamp": 1486927179824,
-  "totalTime": 51,
+  "totalTime": 16,
   "indent": 0
 }));
 
 stubPreparedMessages.set("XHR POST request", new NetworkEventMessage({
   "id": "1",
   "actor": "server1.conn2.child1/netEvent30",
   "level": "log",
   "isXHR": true,
@@ -111,39 +117,42 @@ stubPreparedMessages.set("XHR POST reque
   "response": {},
   "source": "network",
   "type": "log",
   "groupId": null,
   "timeStamp": 1487022058414,
   "indent": 0
 }));
 
-stubPreparedMessages.set("XHR POST request eventTimings", new NetworkEventMessage({
+stubPreparedMessages.set("XHR POST request update", new NetworkEventMessage({
   "id": "1",
-  "actor": "server1.conn2.child1/netEvent30",
+  "actor": "server1.conn0.child1/netEvent32",
   "level": "log",
-  "isXHR": true,
   "request": {
     "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
     "method": "POST",
     "headersSize": 509
   },
   "response": {
     "httpVersion": "HTTP/1.1",
     "status": "404",
     "statusText": "Not Found",
     "headersSize": 160,
     "remoteAddress": "127.0.0.1",
-    "remotePort": 8888
+    "remotePort": 8888,
+    "content": {
+      "mimeType": "text/html; charset=utf-8"
+    },
+    "bodySize": 904,
+    "transferredSize": 904
   },
   "source": "network",
   "type": "log",
   "groupId": null,
-  "timeStamp": 1486927183220,
-  "totalTime": 12,
+  "totalTime": 10,
   "indent": 0
 }));
 
 stubPackets.set("GET request", {
   "_type": "NetworkEvent",
   "timeStamp": 1487022056850,
   "node": null,
   "actor": "server1.conn0.child1/netEvent30",
@@ -184,85 +193,39 @@ stubPackets.set("GET request", {
   },
   "response": {},
   "timings": {},
   "updates": [],
   "private": false,
   "from": "server1.conn0.child1/consoleActor2"
 });
 
-stubPackets.set("GET request eventTimings", {
-  "packet": {
-    "from": "server1.conn0.child1/netEvent30",
-    "type": "networkEventUpdate",
-    "updateType": "eventTimings",
-    "totalTime": 23
-  },
+stubPackets.set("GET request update", {
   "networkInfo": {
     "_type": "NetworkEvent",
-    "timeStamp": 1486927175277,
-    "node": null,
     "actor": "server1.conn0.child1/netEvent30",
-    "discardRequestBody": true,
-    "discardResponseBody": false,
-    "startedDateTime": "2017-02-12T19:19:35.277Z",
     "request": {
       "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
       "method": "GET",
       "headersSize": 489
     },
-    "isXHR": false,
-    "cause": {
-      "type": "img",
-      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-      "stacktrace": [
-        {
-          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-          "lineNumber": 3,
-          "columnNumber": 1,
-          "functionName": "triggerPacket",
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js line 52 > eval",
-          "lineNumber": 7,
-          "columnNumber": 9,
-          "functionName": null,
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js",
-          "lineNumber": 53,
-          "columnNumber": 20,
-          "functionName": null,
-          "asyncCause": null
-        }
-      ]
-    },
     "response": {
       "httpVersion": "HTTP/1.1",
       "status": "404",
       "statusText": "Not Found",
       "headersSize": 160,
       "remoteAddress": "127.0.0.1",
-      "remotePort": 8888
+      "remotePort": 8888,
+      "content": {
+        "mimeType": "text/html; charset=utf-8"
+      },
+      "bodySize": 904,
+      "transferredSize": 904
     },
-    "timings": {},
-    "updates": [
-      "requestHeaders",
-      "requestCookies",
-      "responseStart",
-      "securityInfo",
-      "responseHeaders",
-      "responseCookies",
-      "eventTimings"
-    ],
-    "private": false,
-    "securityInfo": "insecure",
-    "totalTime": 23
+    "totalTime": 16
   }
 });
 
 stubPackets.set("XHR GET request", {
   "_type": "NetworkEvent",
   "timeStamp": 1487022057746,
   "node": null,
   "actor": "server1.conn1.child1/netEvent30",
@@ -303,85 +266,39 @@ stubPackets.set("XHR GET request", {
   },
   "response": {},
   "timings": {},
   "updates": [],
   "private": false,
   "from": "server1.conn1.child1/consoleActor2"
 });
 
-stubPackets.set("XHR GET request eventTimings", {
-  "packet": {
-    "from": "server1.conn1.child1/netEvent30",
-    "type": "networkEventUpdate",
-    "updateType": "eventTimings",
-    "totalTime": 51
-  },
+stubPackets.set("XHR GET request update", {
   "networkInfo": {
     "_type": "NetworkEvent",
-    "timeStamp": 1486927179824,
-    "node": null,
-    "actor": "server1.conn1.child1/netEvent30",
-    "discardRequestBody": true,
-    "discardResponseBody": false,
-    "startedDateTime": "2017-02-12T19:19:39.824Z",
+    "actor": "server1.conn0.child1/netEvent31",
     "request": {
       "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
       "method": "GET",
       "headersSize": 489
     },
-    "isXHR": true,
-    "cause": {
-      "type": "xhr",
-      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-      "stacktrace": [
-        {
-          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-          "lineNumber": 4,
-          "columnNumber": 1,
-          "functionName": "triggerPacket",
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js line 52 > eval",
-          "lineNumber": 7,
-          "columnNumber": 9,
-          "functionName": null,
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js",
-          "lineNumber": 53,
-          "columnNumber": 20,
-          "functionName": null,
-          "asyncCause": null
-        }
-      ]
-    },
     "response": {
       "httpVersion": "HTTP/1.1",
       "status": "404",
       "statusText": "Not Found",
       "headersSize": 160,
       "remoteAddress": "127.0.0.1",
-      "remotePort": 8888
+      "remotePort": 8888,
+      "content": {
+        "mimeType": "text/html; charset=utf-8"
+      },
+      "bodySize": 904,
+      "transferredSize": 904
     },
-    "timings": {},
-    "updates": [
-      "requestHeaders",
-      "requestCookies",
-      "responseStart",
-      "securityInfo",
-      "responseHeaders",
-      "responseCookies",
-      "eventTimings"
-    ],
-    "private": false,
-    "securityInfo": "insecure",
-    "totalTime": 51
+    "totalTime": 16
   }
 });
 
 stubPackets.set("XHR POST request", {
   "_type": "NetworkEvent",
   "timeStamp": 1487022058414,
   "node": null,
   "actor": "server1.conn2.child1/netEvent30",
@@ -422,84 +339,38 @@ stubPackets.set("XHR POST request", {
   },
   "response": {},
   "timings": {},
   "updates": [],
   "private": false,
   "from": "server1.conn2.child1/consoleActor2"
 });
 
-stubPackets.set("XHR POST request eventTimings", {
-  "packet": {
-    "from": "server1.conn2.child1/netEvent30",
-    "type": "networkEventUpdate",
-    "updateType": "eventTimings",
-    "totalTime": 12
-  },
+stubPackets.set("XHR POST request update", {
   "networkInfo": {
     "_type": "NetworkEvent",
-    "timeStamp": 1486927183220,
-    "node": null,
-    "actor": "server1.conn2.child1/netEvent30",
-    "discardRequestBody": true,
-    "discardResponseBody": false,
-    "startedDateTime": "2017-02-12T19:19:43.220Z",
+    "actor": "server1.conn0.child1/netEvent32",
     "request": {
       "url": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/inexistent.html",
       "method": "POST",
       "headersSize": 509
     },
-    "isXHR": true,
-    "cause": {
-      "type": "xhr",
-      "loadingDocumentUri": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-      "stacktrace": [
-        {
-          "filename": "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-network-event.html",
-          "lineNumber": 4,
-          "columnNumber": 1,
-          "functionName": "triggerPacket",
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js line 52 > eval",
-          "lineNumber": 7,
-          "columnNumber": 9,
-          "functionName": null,
-          "asyncCause": null
-        },
-        {
-          "filename": "resource://testing-common/content-task.js",
-          "lineNumber": 53,
-          "columnNumber": 20,
-          "functionName": null,
-          "asyncCause": null
-        }
-      ]
-    },
     "response": {
       "httpVersion": "HTTP/1.1",
       "status": "404",
       "statusText": "Not Found",
       "headersSize": 160,
       "remoteAddress": "127.0.0.1",
-      "remotePort": 8888
+      "remotePort": 8888,
+      "content": {
+        "mimeType": "text/html; charset=utf-8"
+      },
+      "bodySize": 904,
+      "transferredSize": 904
     },
-    "timings": {},
-    "updates": [
-      "requestHeaders",
-      "requestCookies",
-      "responseStart",
-      "securityInfo",
-      "responseHeaders",
-      "responseCookies",
-      "eventTimings"
-    ],
-    "private": false,
-    "securityInfo": "insecure",
-    "totalTime": 12
+    "totalTime": 10
   }
 });
 
 module.exports = {
   stubPreparedMessages,
   stubPackets,
 };
--- a/devtools/client/webconsole/new-console-output/test/store/messages.test.js
+++ b/devtools/client/webconsole/new-console-output/test/store/messages.test.js
@@ -484,35 +484,35 @@ describe("Message reducer:", () => {
       const { dispatch, getState } = setupStore([
         "GET request",
         "XHR GET request"
       ]);
 
       let networkUpdates = getAllNetworkMessagesUpdateById(getState());
       expect(Object.keys(networkUpdates).length).toBe(0);
 
-      let updatePacket = stubPackets.get("GET request eventTimings");
+      let updatePacket = stubPackets.get("GET request update");
       dispatch(actions.networkMessageUpdate(updatePacket));
 
       networkUpdates = getAllNetworkMessagesUpdateById(getState());
       expect(Object.keys(networkUpdates).length).toBe(1);
 
-      let xhrUpdatePacket = stubPackets.get("XHR GET request eventTimings");
+      let xhrUpdatePacket = stubPackets.get("XHR GET request update");
       dispatch(actions.networkMessageUpdate(xhrUpdatePacket));
 
       networkUpdates = getAllNetworkMessagesUpdateById(getState());
       expect(Object.keys(networkUpdates).length).toBe(2);
     });
 
     it("resets networkMessagesUpdateById in response to MESSAGES_CLEAR action", () => {
       const { dispatch, getState } = setupStore([
         "XHR GET request"
       ]);
 
-      const updatePacket = stubPackets.get("XHR GET request eventTimings");
+      const updatePacket = stubPackets.get("XHR GET request update");
       dispatch(actions.networkMessageUpdate(updatePacket));
 
       let networkUpdates = getAllNetworkMessagesUpdateById(getState());
       expect(Object.keys(networkUpdates).length).toBe(1);
 
       dispatch(actions.messagesClear());
 
       networkUpdates = getAllNetworkMessagesUpdateById(getState());