mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-27 12:50:09 +00:00
bug 580508 - fix test_resolve_uris.js test. r=mossop
This commit is contained in:
parent
692ed55c12
commit
d244c9fd91
@ -1,4 +1,4 @@
|
||||
resource foo resource://foo/foo-resource/
|
||||
resource foo .
|
||||
content foo resource://foo/foo-content/
|
||||
locale foo foo resource://foo/foo-locale/
|
||||
skin foo foo resource://foo/foo-skin/
|
||||
|
@ -41,11 +41,14 @@ if (typeof registerManifests === "undefined") {
|
||||
load("../unit/head_crtestutils.js");
|
||||
}
|
||||
|
||||
let manifests = [
|
||||
do_get_file("../unit/data/test_resolve_uris.manifest"),
|
||||
];
|
||||
let manifestFile = do_get_file("../unit/data/test_resolve_uris.manifest");
|
||||
|
||||
let manifests = [ manifestFile ];
|
||||
registerManifests(manifests);
|
||||
|
||||
let ios = Cc["@mozilla.org/network/io-service;1"].
|
||||
getService(Ci.nsIIOService);
|
||||
|
||||
function do_run_test()
|
||||
{
|
||||
let cr = Cc["@mozilla.org/chrome/chrome-registry;1"].
|
||||
@ -89,12 +92,11 @@ function do_run_test()
|
||||
expectedURI += "override-me.xul";
|
||||
break;
|
||||
case "resource":
|
||||
expectedURI = ios.newFileURI(manifestFile.parent).spec;
|
||||
sourceURI = "resource://foo/";
|
||||
break;
|
||||
};
|
||||
try {
|
||||
let ios = Cc["@mozilla.org/network/io-service;1"].
|
||||
getService(Ci.nsIIOService);
|
||||
sourceURI = ios.newURI(sourceURI, null, null);
|
||||
let uri;
|
||||
if (type == "resource") {
|
||||
|
Loading…
x
Reference in New Issue
Block a user