fixup! BB 43243: Modify mozharness scripts for Base Browser (e5e4217a) · Commits · The Tor Project / Applications / Tor Browser

testing/mozharness/configs/unittests/mac_unittest.py

+2 −40

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,6 @@
	# file, You can obtain one at http://mozilla.org/MPL/2.0/.		# file, You can obtain one at http://mozilla.org/MPL/2.0/.

	import os		import os
	import sys

	# OS Specifics		# OS Specifics
	INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")		INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")
	@@ -202,45 +201,8 @@ config = {
	"halt_on_failure": True,		"halt_on_failure": True,
	"enabled": True,		"enabled": True,
	},		},
	{		# tor-browser-bundle-testsuite#40107: Skip environment configurations
	"name": "kill_dock",		# from upstream that are unnecessary in our CI setup.
	"cmd": ["killall", "Dock"],
	"architectures": ["64bit"],
	"halt_on_failure": True,
	"enabled": True,
	},
	{
	"name": "verify refresh rate",
	"cmd": [
	sys.executable,
	os.path.join(
	os.getcwd(),
	"mozharness",
	"external_tools",
	"macosx_resolution_refreshrate.py",
	),
	"--check=refresh-rate",
	],
	"architectures": ["64bit"],
	"halt_on_failure": True,
	"enabled": True,
	},
	{
	"name": "verify screen resolution",
	"cmd": [
	sys.executable,
	os.path.join(
	os.getcwd(),
	"mozharness",
	"external_tools",
	"macosx_resolution_refreshrate.py",
	),
	"--check=resolution",
	],
	"architectures": ["64bit"],
	"halt_on_failure": True,
	"enabled": True,
	},
	],		],
	"vcs_output_timeout": 1000,		"vcs_output_timeout": 1000,
	"minidump_save_path": "%(abs_work_dir)s/../minidumps",		"minidump_save_path": "%(abs_work_dir)s/../minidumps",

+2 −32

Original line number	Original line	Diff line number	Diff line
	@@ -222,38 +222,8 @@ config = {
	"halt_on_failure": False,		"halt_on_failure": False,
	"enabled": DISABLE_SCREEN_SAVER,		"enabled": DISABLE_SCREEN_SAVER,
	},		},
	{		# tor-browser-bundle-testsuite#40107: Skip environment configurations
	"name": "run mouse & screen adjustment script",		# from upstream that are unnecessary in our CI setup.
	"cmd": [
	sys.executable,
	os.path.join(
	os.getcwd(),
	"mozharness",
	"external_tools",
	"mouse_and_screen_resolution.py",
	),
	"--configuration-file",
	os.path.join(
	os.getcwd(),
	"mozharness",
	"external_tools",
	"machine-configuration.json",
	),
	(
	"--platform=win10-vm"
	if REQUIRE_GPU and (platform.uname().version == "10.0.19045")
	else (
	"--platform=win11-hw"
	if REQUIRE_GPU
	and platform.uname().version in ("10.0.26100", "10.0.26200")
	else "--platform=win7"
	)
	),
	],
	"architectures": ["32bit", "64bit"],
	"halt_on_failure": True,
	"enabled": ADJUST_MOUSE_AND_SCREEN,
	},
	{		{
	"name": "enable microphone access for msix",		"name": "enable microphone access for msix",
	"cmd": [		"cmd": [