Fix test_0010_timermanager.js test and disable e10s redirect/resume tests in test_resumable_channel.js.

netwerk/test/unit/test_resumable_channel.js

@@ -285,11 +285,22 @@ function run_test() {
     do_check_eq(request.status, NS_ERROR_ENTITY_CHANGED);
     do_check_eq(request.nsIHttpChannel.responseStatus, 416);
 
-    // Redirect + successful resume
-    var chan = make_channel("http://localhost:4444/redir");
-    chan.nsIHttpChannel.setRequestHeader("X-Redir-To", "http://localhost:4444/range", false);
-    chan.nsIResumableChannel.resumeAt(1, entityID);
-    chan.asyncOpen(new ChannelListener(test_redir_resume, null), null);
+    // XXX skip redirect/resume tests, as they're busted on e10s (bug 587165)
+    try { // nsIXULRuntime is not available in some configurations.
+      let processType = Components.classes["@mozilla.org/xre/runtime;1"].
+                        getService(Components.interfaces.nsIXULRuntime).processType;
+      if (processType == Components.interfaces.nsIXULRuntime.PROCESS_TYPE_DEFAULT) {
+        // Redirect + successful resume
+        var chan = make_channel("http://localhost:4444/redir");
+        chan.nsIHttpChannel.setRequestHeader("X-Redir-To", "http://localhost:4444/range", false);
+        chan.nsIResumableChannel.resumeAt(1, entityID);
+        chan.asyncOpen(new ChannelListener(test_redir_resume, null), null);
+      } else {
+        httpserver.stop(do_test_finished);
+      }
+    } catch (e) {
+      httpserver.stop(do_test_finished);
+    }
   }
 
   function test_redir_resume(request, data, ctx) {

toolkit/mozapps/update/test_timermanager/unit/test_0010_timermanager.js

@@ -271,7 +271,7 @@ function check_test1thru6() {
        "registered\n");
   do_check_eq(count, 0);
 
-  do_timeout(0, run_test7());
+  do_timeout(0, run_test7);
 }
 
 function run_test7() {