wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 888526 - Use the profile dir instead of the bin dir for contentpref xpcshell tests. r=ted

Browse Source
This commit is contained in:
Mihnea Dobrescu-Balaur 2013-07-11 15:10:28 -07:00
parent bacde1a4a6
commit 885b36c048
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
View File

@ -80,24 +80,23 @@ var ContentPrefTest = {
},
/**
* Get the profile directory, registering ourselves as a provider
* of that directory if necessary.
* Get the profile directory.
*/
getProfileDir: function ContentPrefTest_getProfileDir() {
var profileDir;
try {
profileDir = this._dirSvc.get("ProfD", Ci.nsIFile);
// do_get_profile can be only called from a parent process
if (runningInParent) {
return do_get_profile();
}
catch (e) {}
if (!profileDir) {
this._dirSvc.QueryInterface(Ci.nsIDirectoryService).registerProvider(this);
profileDir = this._dirSvc.get("ProfD", Ci.nsIFile);
this._dirSvc.unregisterProvider(this);
}
return profileDir;
// if running in a content process, this just returns the path
// profile was initialized in the ipc head file
let env = Components.classes["@mozilla.org/process/environment;1"]
.getService(Components.interfaces.nsIEnvironment);
// the python harness sets this in the environment for us
let profd = env.get("XPCSHELL_TEST_PROFILE_DIR");
let file = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile);
file.initWithPath(profd);
return file;
},
/**

4
toolkit/components/contentprefs/tests/unit_ipc/head_contentPrefs.js
View File

@ -1,3 +1,5 @@
// initializing profile here because do_get_profile cannot be called
// from a content process
do_get_profile();
load("../unit/head_contentPrefs.js");