Backed out changeset f898176c408d (bug 1281278) for xpcshell failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Thu, 06 Apr 2017 15:48:18 -0700
changeset 558286 4b2f57ec5a584f4c52638cf3024b8a3ddbf88cfe
parent 558285 5fbd12b4d8e7f48343efa361ab8094ebaf1af6b9
child 558287 2670eec1ed8ab10cb44c7010d996fa28af565442
push id52860
push userbmo:walkingice0204@gmail.com
push dateFri, 07 Apr 2017 13:29:26 +0000
reviewersbackout
bugs1281278
milestone55.0a1
backs outf898176c408dfbc68ef09fd5e5c8edbd06abb19a
Backed out changeset f898176c408d (bug 1281278) for xpcshell failures a=backout
netwerk/test/unit/test_http2.js
testing/xpcshell/moz-http2/moz-http2.js
--- a/netwerk/test/unit/test_http2.js
+++ b/netwerk/test/unit/test_http2.js
@@ -723,18 +723,16 @@ Http2PushApiListener.prototype = {
   // nsIHttpPushListener
   onPush: function onPush(associatedChannel, pushChannel) {
     do_check_eq(associatedChannel.originalURI.spec, "https://localhost:" + serverPort + "/pushapi1");
     do_check_eq (pushChannel.getRequestHeader("x-pushed-request"), "true");
 
     pushChannel.asyncOpen2(this);
     if (pushChannel.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/2") {
       pushChannel.cancel(Components.results.NS_ERROR_ABORT);
-    } else if (pushChannel.originalURI.spec == "https://localhost:" + serverPort + "/pushapi1/3") {
-      do_check_true(pushChannel.getRequestHeader("Accept-Encoding").includes("br"));
     }
   },
 
  // normal Channel listeners
   onStartRequest: function pushAPIOnStart(request, ctx) {
   },
 
   onDataAvailable: function pushAPIOnDataAvailable(request, ctx, stream, offset, cnt) {
@@ -771,17 +769,17 @@ Http2PushApiListener.prototype = {
   }
 };
 
 // pushAPI testcase 1 expects
 // 1 to pull /pushapi1 with 0
 // 2 to see /pushapi1/1 with 1
 // 3 to see /pushapi1/1 with 1 (again)
 // 4 to see /pushapi1/2 that it will cancel
-// 5 to see /pushapi1/3 with 3 with brotli
+// 5 to see /pushapi1/3 with 3
 
 function test_http2_pushapi_1() {
   var chan = makeChan("https://localhost:" + serverPort + "/pushapi1");
   chan.loadGroup = loadGroup;
   var listener = new Http2PushApiListener();
   chan.notificationCallbacks = listener;
   chan.asyncOpen2(listener);
 }
--- a/testing/xpcshell/moz-http2/moz-http2.js
+++ b/testing/xpcshell/moz-http2/moz-http2.js
@@ -339,25 +339,24 @@ function handleRequest(req, res) {
       'subresource' : '2',
       'content-length' : 1,
       'X-Connection-Http2': 'yes'
     });
     push2.end('2');
 
     push3 = res.push(
         { hostname: 'localhost:' + serverPort, port: serverPort, path : '/pushapi1/3', method : 'GET',
-          headers: {'x-pushed-request': 'true', 'Accept-Encoding' : 'br'}});
+          headers: {'x-pushed-request': 'true'}});
     push3.writeHead(200, {
       'pushed' : 'yes',
-      'content-length' : 6,
+      'content-length' : 1,
       'subresource' : '3',
-      'content-encoding' : 'br',
       'X-Connection-Http2': 'yes'
     });
-    push3.end(Buffer.from("8B0080330A03", 'hex')); // '3\n'
+    push3.end('3');
 
     content = '0';
   }
 
   else if (u.pathname === "/big") {
     content = generateContent(128 * 1024);
     var hash = crypto.createHash('md5');
     hash.update(content);