From fdc186d526b2f42455255ab116e6d4a69f735995 Mon Sep 17 00:00:00 2001 From: Dan Witte Date: Fri, 13 Aug 2010 13:28:14 -0700 Subject: [PATCH] Reenable tests for bugs 586205 and 586238. --- netwerk/test/unit/test_event_sink.js | 6 ------ netwerk/test/unit/test_httpsuspend.js | 4 ---- netwerk/test/unit/test_resumable_channel.js | 20 +++++++++++--------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/netwerk/test/unit/test_event_sink.js b/netwerk/test/unit/test_event_sink.js index 49564ff00ff3..34a64ee1664f 100644 --- a/netwerk/test/unit/test_event_sink.js +++ b/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); diff --git a/netwerk/test/unit/test_httpsuspend.js b/netwerk/test/unit/test_httpsuspend.js index 0176770c17cc..0459c637aaeb 100644 --- a/netwerk/test/unit/test_httpsuspend.js +++ b/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); diff --git a/netwerk/test/unit/test_resumable_channel.js b/netwerk/test/unit/test_resumable_channel.js index 409d67cbbfd5..52f575944ee8 100644 --- a/netwerk/test/unit/test_resumable_channel.js +++ b/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");