Reenable tests for bugs 586205 and 586238.

netwerk/test/unit/test_event_sink.js

@@ -105,12 +105,6 @@ function makeChan(url) {
 var httpserv = null;
 
 function run_test() {
-// DISABLE TEST: bug 586205
-_dump('FIXME/bug 586205: disabled to avoid perma-orange\n');
-}
-function never() {
-
-
   httpserv = new nsHttpServer();
   httpserv.registerPathHandler("/redirect", redirect);
   httpserv.registerPathHandler("/redirectfile", redirectfile);

netwerk/test/unit/test_httpsuspend.js

@@ -54,10 +54,6 @@ function makeChan(url) {
 var httpserv = null;
 
 function run_test() {
-// DISABLE TEST: bug 586238
-  _dump('FIXME/bug 586238: disabled to avoid perma-orange\n');
-}
-function never() {
   httpserv = new nsHttpServer();
   httpserv.registerPathHandler("/woo", data);
   httpserv.start(4444);

netwerk/test/unit/test_resumable_channel.js

@@ -68,10 +68,6 @@ Requestor.prototype = {
 };
 
 function run_test() {
-// DISABLE TEST: bug 586238
-  _dump('FIXME/bug 586238: disabled to avoid perma-orange\n');
-}
-function never() {
   dump("*** run_test\n");
   httpserver = new nsHttpServer();
   httpserver.registerPathHandler("/auth", authHandler);
@@ -215,14 +211,20 @@ function never() {
     do_check_true(request.nsIHttpChannel.requestSucceeded);
     do_check_eq(data, rangeBody);
 
-    // XXX skip all authentication tests for now, as they're busted on e10s (bug 537782)
 
     // Authentication (no password; working resume)
     // (should not give us any data)
-    /*var chan = make_channel("http://localhost:4444/range");
-    chan.nsIResumableChannel.resumeAt(1, entityID);
-    chan.nsIHttpChannel.setRequestHeader("X-Need-Auth", "true", false);
-    chan.asyncOpen(new ChannelListener(test_auth_nopw, null, CL_EXPECT_FAILURE), null);*/
+    // XXX skip all authentication tests for now, as they're busted on e10s (bug 587146)
+    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) {
+        var chan = make_channel("http://localhost:4444/range");
+        chan.nsIResumableChannel.resumeAt(1, entityID);
+        chan.nsIHttpChannel.setRequestHeader("X-Need-Auth", "true", false);
+        chan.asyncOpen(new ChannelListener(test_auth_nopw, null, CL_EXPECT_FAILURE), null);
+      }
+    } catch (e) { }
 
     // 404 page (same content length as real content)
     var chan = make_channel("http://localhost:4444/range");