Bug 772272 - Remove do_load_httpd_js from xpcshell tests, Final, r=ted

Remove last three references, final cleanup
This commit is contained in:
Mark Capella 2012-08-23 08:16:44 -04:00
parent f694e12e0d
commit daef2756b5
3 changed files with 7 additions and 11 deletions

View File

@ -4,7 +4,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
do_load_httpd_js();
/**
* Loads _HTTPD_JS_PATH file, which is dynamically defined by
* <runxpcshelltests.py>.
*/
load(_HTTPD_JS_PATH);
// if these tests fail, we'll want the debug output
DEBUG = true;

View File

@ -4,10 +4,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
do_load_httpd_js();
Components.utils.import("resource://testing-common/httpd.js");
function run_test() {
var httpserver = new nsHttpServer();
var httpserver = new HttpServer();
do_check_neq(httpserver, null);
do_check_neq(httpserver.QueryInterface(Components.interfaces.nsIHttpServer), null);
}

View File

@ -663,14 +663,6 @@ function do_get_cwd() {
return do_get_file("");
}
/**
* Loads _HTTPD_JS_PATH file, which is dynamically defined by
* <runxpcshelltests.py>.
*/
function do_load_httpd_js() {
load(_HTTPD_JS_PATH);
}
function do_load_manifest(path) {
var lf = do_get_file(path);
const nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar;