Bug 1404671 check the error string draft
authorShane Caraveo <scaraveo@mozilla.com>
Tue, 14 Nov 2017 17:09:23 -0800
changeset 697944 f037e586c24ec0213272cb03f91bd5c2651f5531
parent 697275 c616a6fd5e4b20cca139fcdd3957682afaa862b9
child 740250 2d2ad94e87b922b51d1e3c14da415f61e1c4fd26
push id89148
push usermixedpuppy@gmail.com
push dateWed, 15 Nov 2017 01:09:46 +0000
bugs1404671
milestone59.0a1
Bug 1404671 check the error string MozReview-Commit-ID: GEiFEb7JMdh
toolkit/components/extensions/test/mochitest/head_webrequest.js
toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
--- a/toolkit/components/extensions/test/mochitest/head_webrequest.js
+++ b/toolkit/components/extensions/test/mochitest/head_webrequest.js
@@ -227,17 +227,21 @@ function background(events) {
         // sure they're all consistent.
         expectedIp = expectedIp || details.ip;
         browser.test.assertEq(expectedIp, details.ip, `correct ip for ${details.url}`);
       }
       if (expected.headers && expected.headers.response) {
         checkHeaders("response", expected, details);
       }
     },
-    onErrorOccurred() {},
+    onErrorOccurred(expected, details, result) {
+      if (expected.error) {
+        browser.test.assertEq(expected.error, details.error, "expected error message received in onErrorOccurred");
+      }
+    },
   };
 
   function getListener(name) {
     return details => {
       let result = {};
       browser.test.log(`${name} ${details.requestId} ${details.url}`);
       let expected = getExpected(details);
       if (!expected) {
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_basic.html
@@ -344,16 +344,17 @@ add_task(async function test_webRequest_
     "dummy_page.html": {
       type: "sub_frame",
       status: 404,
     },
     "badrobot": {
       type: "sub_frame",
       status: 404,
       events: ["onBeforeRequest", "onBeforeSendHeaders", "onSendHeaders", "onErrorOccurred"],
+      error: "NS_ERROR_UNKNOWN_HOST",
     },
   };
   extension.sendMessage("set-expected", {expect, origin: location.href});
   await extension.awaitMessage("continue");
   addFrame("data:text/plain,webRequestTest");
   addFrame("data:text/plain,webRequestTest_bad");
   await extension.awaitMessage("cancelled");
   addFrame("redirection.sjs");