nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1898801 - Fix tests on mac which use python2 to use python3 on macosx 14.x+. r=gbrown

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D211604
This commit is contained in:
Joel Maher 2024-05-24 19:45:19 +00:00
parent c143f86d86
commit 15a6a58ab8
2 changed files with 11 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
browser/components/shell/test/browser_1119088.js
View file

@ -5,7 +5,12 @@ const NS_OSX_PICTURE_DOCUMENTS_DIR = "Pct";
// 1) check the desktop background image matches what we set it to via
// nsIShellService::setDesktopBackground() and
// 2) revert the desktop background image to the OS default
const kPythonPath = "/usr/bin/python";
let kPythonPath = "/usr/bin/python";
if (AppConstants.isPlatformAndVersionAtLeast("macosx", 23.0)) {
kPythonPath = "/usr/local/bin/python3";
}
const kDesktopCheckerScriptPath =
"browser/browser/components/shell/test/mac_desktop_image.py";
const kDefaultBackgroundImage_10_14 =
@ -19,6 +24,7 @@ ChromeUtils.defineESModuleGetters(this, {
function getPythonExecutableFile() {
let python = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
info(`Using python at location ${kPythonPath}`);
python.initWithPath(kPythonPath);
return python;
}

5
security/sandbox/test/browser_bug1393259.js
View file

@ -17,7 +17,10 @@ const kPageURL =
"http://example.com/browser/security/sandbox/test/bug1393259.html";
// Parameters for running the python script that registers/unregisters fonts.
const kPythonPath = "/usr/bin/python";
let kPythonPath = "/usr/bin/python";
if (AppConstants.isPlatformAndVersionAtLeast("macosx", 23.0)) {
kPythonPath = "/usr/local/bin/python3";
}
const kFontInstallerPath = "browser/security/sandbox/test/mac_register_font.py";
const kUninstallFlag = "-u";
const kVerboseFlag = "-v";