Bug 610654 - TEST-UNEXPECTED-FAIL (randomorange) r=bz a=test-only

netwerk/test/unit/test_bug596443.js

@@ -1,28 +1,31 @@
 do_load_httpd_js();
 var httpserver = new nsHttpServer();
+var expectedOnStopRequests = 3;
 
 function getCacheService() {
     return Components.classes["@mozilla.org/network/cache-service;1"]
             .getService(Components.interfaces.nsICacheService);
 }
 
-function setupChannel(suffix, flags) {
+function setupChannel(suffix, xRequest, flags) {
     var ios = Components.classes["@mozilla.org/network/io-service;1"]
             .getService(Ci.nsIIOService);
     var chan = ios.newChannel("http://localhost:4444" + suffix, "", null);
     if (flags)
         chan.loadFlags |= flags;
-    return chan;
+
+    var httpChan = chan.QueryInterface(Components.interfaces.nsIHttpChannel);
+    httpChan.setRequestHeader("x-request", xRequest, false);
+        
+    return httpChan;
 }
 
-function Listener(response, finalResponse) {
+function Listener(response) {
     this._response = response;
-    this._finalResponse = finalResponse;
 }
 Listener.prototype = {
     _response: null,
     _buffer: null,
-    _finalResponse: false,
 
     QueryInterface: function(iid) {
         if (iid.equals(Components.interfaces.nsIStreamListener) ||
@@ -39,9 +42,8 @@ Listener.prototype = {
         this._buffer = this._buffer.concat(read_stream(stream, count));
     },
     onStopRequest: function (request, ctx, status) {
-        var expected = "Response"+this._response;
-        do_check_eq(this._buffer, expected);
-        if (this._finalResponse)
+        do_check_eq(this._buffer, this._response);
+        if (--expectedOnStopRequests == 0)
             do_timeout(10, function() {
                         httpserver.stop(do_test_finished);
                     });
@@ -59,27 +61,24 @@ function run_test() {
     getCacheService().evictEntries(
             Components.interfaces.nsICache.STORE_ANYWHERE);
 
-    var ch0 = setupChannel("/bug596443", Ci.nsIRequest.LOAD_BYPASS_CACHE);
-    ch0.asyncOpen(new Listener(0), null);
+    var ch0 = setupChannel("/bug596443", "Response0", Ci.nsIRequest.LOAD_BYPASS_CACHE);
+    ch0.asyncOpen(new Listener("Response0"), null);
 
-    var ch1 = setupChannel("/bug596443", Ci.nsIRequest.LOAD_BYPASS_CACHE);
-    ch1.asyncOpen(new Listener(1), null);
+    var ch1 = setupChannel("/bug596443", "Response1", Ci.nsIRequest.LOAD_BYPASS_CACHE);
+    ch1.asyncOpen(new Listener("Response1"), null);
 
-    var ch2 = setupChannel("/bug596443");
-    ch2.asyncOpen(new Listener(1, true), null); // Note param: we expect this to come from cache
+    var ch2 = setupChannel("/bug596443", "Should not be used");
+    ch2.asyncOpen(new Listener("Response1"), null); // Note param: we expect this to come from cache
 
     do_test_pending();
 }
 
 function triggerHandlers() {
-    do_timeout(100, function() {
-        do_timeout(100, initialHandlers[1]);
-        do_timeout(100, initialHandlers[0]);
-    });
+    do_timeout(100, handlers[1]);
+    do_timeout(100, handlers[0]);
 }
 
-var initialHandlers = [];
-var handlerNo = 0;
+var handlers = [];
 function handler(metadata, response) {
     var func = function(body) {
         return function() {
@@ -92,9 +91,9 @@ function handler(metadata, response) {
          }};
 
     response.processAsync();
-    initialHandlers[handlerNo] = func("Response"+handlerNo);
-    handlerNo++;
+    var request = metadata.getHeader("x-request");
+    handlers.push(func(request));
 
-    if (handlerNo > 1)
+    if (handlers.length > 1)
         triggerHandlers();
 }