Commits:
-
be65852c
by Beatriz Rizental at 2026-06-16T10:28:45-03:00
fixup! BB 40925: Implemented the Security Level component
tor-browser-bundle-testsuite#40107: Tag XPCShell tests
-
053b4268
by Beatriz Rizental at 2026-06-16T10:29:28-03:00
fixup! BB 43525: Skip Remote Settings for search engine customization.
tor-browser-bundle-testsuite#40107: Tag XPCShell tests
-
9aa4dfe8
by Beatriz Rizental at 2026-06-16T10:29:35-03:00
fixup! BB 43243: Modify mozharness scripts for Base Browser
tor-browser-bundle-testsuite#40107: Update pywin version.
Our VM Python version must be higher than Mozilla's.
-
df265c52
by Beatriz Rizental at 2026-06-18T17:14:25-03:00
fixup! BB 43243: Modify mozharness scripts for Base Browser
tor-browser-bundle-testsuite#40107: Get NODEJS path from the
environment.
-
49da7c51
by Beatriz Rizental at 2026-06-18T17:14:26-03:00
fixup! BB 43243: Modify mozharness scripts for Base Browser
tor-browser-bundle-testsuite#40107: Do not error when unable
to define symbols URL.
-
9ed2c7fe
by Beatriz Rizental at 2026-06-18T17:51:35-03:00
fixup! BB 43243: Modify mozharness scripts for Base Browser
tor-browser-bundle-testsuite#40107: Drop unnecessary environment
configurations.
6 changed files:
Changes:
testing/mozharness/configs/android/android_common.py
| ... |
... |
@@ -9,8 +9,8 @@ |
|
9
|
9
|
|
|
10
|
10
|
import os
|
|
11
|
11
|
|
|
12
|
|
-NODEJS_PATH = None
|
|
13
|
|
-if "MOZ_FETCHES_DIR" in os.environ:
|
|
|
12
|
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
|
|
|
13
|
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
|
|
14
|
14
|
NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
|
|
15
|
15
|
|
|
16
|
16
|
|
testing/mozharness/configs/unittests/linux_unittest.py
| ... |
... |
@@ -19,8 +19,8 @@ ADJUST_MOUSE_AND_SCREEN = False |
|
19
|
19
|
# Note: keep these Valgrind .sup file names consistent with those
|
|
20
|
20
|
# in testing/mochitest/mochitest_options.py.
|
|
21
|
21
|
VALGRIND_SUPP_DIR = os.path.join(os.getcwd(), "build/tests/mochitest")
|
|
22
|
|
-NODEJS_PATH = None
|
|
23
|
|
-if "MOZ_FETCHES_DIR" in os.environ:
|
|
|
22
|
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
|
|
|
23
|
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
|
|
24
|
24
|
NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
|
|
25
|
25
|
|
|
26
|
26
|
VALGRIND_SUPP_CROSS_ARCH = os.path.join(VALGRIND_SUPP_DIR, "cross-architecture.sup")
|
testing/mozharness/configs/unittests/mac_unittest.py
| ... |
... |
@@ -3,12 +3,11 @@ |
|
3
|
3
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
4
|
4
|
|
|
5
|
5
|
import os
|
|
6
|
|
-import sys
|
|
7
|
6
|
|
|
8
|
7
|
# OS Specifics
|
|
9
|
8
|
INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")
|
|
10
|
|
-NODEJS_PATH = None
|
|
11
|
|
-if "MOZ_FETCHES_DIR" in os.environ:
|
|
|
9
|
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
|
|
|
10
|
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
|
|
12
|
11
|
NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
|
|
13
|
12
|
|
|
14
|
13
|
XPCSHELL_NAME = "xpcshell"
|
| ... |
... |
@@ -202,45 +201,8 @@ config = { |
|
202
|
201
|
"halt_on_failure": True,
|
|
203
|
202
|
"enabled": True,
|
|
204
|
203
|
},
|
|
205
|
|
- {
|
|
206
|
|
- "name": "kill_dock",
|
|
207
|
|
- "cmd": ["killall", "Dock"],
|
|
208
|
|
- "architectures": ["64bit"],
|
|
209
|
|
- "halt_on_failure": True,
|
|
210
|
|
- "enabled": True,
|
|
211
|
|
- },
|
|
212
|
|
- {
|
|
213
|
|
- "name": "verify refresh rate",
|
|
214
|
|
- "cmd": [
|
|
215
|
|
- sys.executable,
|
|
216
|
|
- os.path.join(
|
|
217
|
|
- os.getcwd(),
|
|
218
|
|
- "mozharness",
|
|
219
|
|
- "external_tools",
|
|
220
|
|
- "macosx_resolution_refreshrate.py",
|
|
221
|
|
- ),
|
|
222
|
|
- "--check=refresh-rate",
|
|
223
|
|
- ],
|
|
224
|
|
- "architectures": ["64bit"],
|
|
225
|
|
- "halt_on_failure": True,
|
|
226
|
|
- "enabled": True,
|
|
227
|
|
- },
|
|
228
|
|
- {
|
|
229
|
|
- "name": "verify screen resolution",
|
|
230
|
|
- "cmd": [
|
|
231
|
|
- sys.executable,
|
|
232
|
|
- os.path.join(
|
|
233
|
|
- os.getcwd(),
|
|
234
|
|
- "mozharness",
|
|
235
|
|
- "external_tools",
|
|
236
|
|
- "macosx_resolution_refreshrate.py",
|
|
237
|
|
- ),
|
|
238
|
|
- "--check=resolution",
|
|
239
|
|
- ],
|
|
240
|
|
- "architectures": ["64bit"],
|
|
241
|
|
- "halt_on_failure": True,
|
|
242
|
|
- "enabled": True,
|
|
243
|
|
- },
|
|
|
204
|
+ # tor-browser-bundle-testsuite#40107: Skip environment configurations
|
|
|
205
|
+ # from upstream that are unnecessary in our CI setup.
|
|
244
|
206
|
],
|
|
245
|
207
|
"vcs_output_timeout": 1000,
|
|
246
|
208
|
"minidump_save_path": "%(abs_work_dir)s/../minidumps",
|
testing/mozharness/configs/unittests/win_unittest.py
| ... |
... |
@@ -9,9 +9,9 @@ import sys |
|
9
|
9
|
# OS Specifics
|
|
10
|
10
|
ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
|
|
11
|
11
|
BINARY_PATH = os.path.join(ABS_WORK_DIR, "firefox", "firefox.exe")
|
|
12
|
|
-INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.zip")
|
|
13
|
|
-NODEJS_PATH = None
|
|
14
|
|
-if "MOZ_FETCHES_DIR" in os.environ:
|
|
|
12
|
+INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.exe")
|
|
|
13
|
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
|
|
|
14
|
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
|
|
15
|
15
|
NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/node.exe")
|
|
16
|
16
|
|
|
17
|
17
|
REQUIRE_GPU = False
|
| ... |
... |
@@ -22,7 +22,7 @@ USE_HARDWARE = False |
|
22
|
22
|
if "USE_HARDWARE" in os.environ:
|
|
23
|
23
|
USE_HARDWARE = os.environ["USE_HARDWARE"] == "1"
|
|
24
|
24
|
|
|
25
|
|
-PYWIN32 = "pywin32==306"
|
|
|
25
|
+PYWIN32 = "pywin32==312"
|
|
26
|
26
|
|
|
27
|
27
|
XPCSHELL_NAME = "xpcshell.exe"
|
|
28
|
28
|
EXE_SUFFIX = ".exe"
|
| ... |
... |
@@ -222,38 +222,8 @@ config = { |
|
222
|
222
|
"halt_on_failure": False,
|
|
223
|
223
|
"enabled": DISABLE_SCREEN_SAVER,
|
|
224
|
224
|
},
|
|
225
|
|
- {
|
|
226
|
|
- "name": "run mouse & screen adjustment script",
|
|
227
|
|
- "cmd": [
|
|
228
|
|
- sys.executable,
|
|
229
|
|
- os.path.join(
|
|
230
|
|
- os.getcwd(),
|
|
231
|
|
- "mozharness",
|
|
232
|
|
- "external_tools",
|
|
233
|
|
- "mouse_and_screen_resolution.py",
|
|
234
|
|
- ),
|
|
235
|
|
- "--configuration-file",
|
|
236
|
|
- os.path.join(
|
|
237
|
|
- os.getcwd(),
|
|
238
|
|
- "mozharness",
|
|
239
|
|
- "external_tools",
|
|
240
|
|
- "machine-configuration.json",
|
|
241
|
|
- ),
|
|
242
|
|
- (
|
|
243
|
|
- "--platform=win10-vm"
|
|
244
|
|
- if REQUIRE_GPU and (platform.uname().version == "10.0.19045")
|
|
245
|
|
- else (
|
|
246
|
|
- "--platform=win11-hw"
|
|
247
|
|
- if REQUIRE_GPU
|
|
248
|
|
- and platform.uname().version in ("10.0.26100", "10.0.26200")
|
|
249
|
|
- else "--platform=win7"
|
|
250
|
|
- )
|
|
251
|
|
- ),
|
|
252
|
|
- ],
|
|
253
|
|
- "architectures": ["32bit", "64bit"],
|
|
254
|
|
- "halt_on_failure": True,
|
|
255
|
|
- "enabled": ADJUST_MOUSE_AND_SCREEN,
|
|
256
|
|
- },
|
|
|
225
|
+ # tor-browser-bundle-testsuite#40107: Skip environment configurations
|
|
|
226
|
+ # from upstream that are unnecessary in our CI setup.
|
|
257
|
227
|
{
|
|
258
|
228
|
"name": "enable microphone access for msix",
|
|
259
|
229
|
"cmd": [
|
testing/mozharness/scripts/desktop_unittest.py
| ... |
... |
@@ -639,13 +639,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM |
|
639
|
639
|
symbols_url = self.installer_url.replace(
|
|
640
|
640
|
ext, ".crashreporter-symbols.zip"
|
|
641
|
641
|
)
|
|
642
|
|
- if not symbols_url:
|
|
643
|
|
- self.fatal(
|
|
644
|
|
- "self.installer_url was found but symbols_url could \
|
|
645
|
|
- not be determined"
|
|
646
|
|
- )
|
|
647
|
|
- else:
|
|
648
|
|
- self.fatal("self.installer_url was not found in self.config")
|
|
|
642
|
+ # tor-browser-bundle-testsuite#40107: Do not error if unable to set symbols URL.
|
|
|
643
|
+ # We do not generate symbols for all platforms and the symbols we do generate are
|
|
|
644
|
+ # not at the expected places. We may enable this in the future, but it's not
|
|
|
645
|
+ # a priority at the moment.
|
|
649
|
646
|
self.info("setting symbols_url as %s" % (symbols_url))
|
|
650
|
647
|
self.symbols_url = symbols_url
|
|
651
|
648
|
return self.symbols_url
|
toolkit/components/search/tests/xpcshell/xpcshell.toml
| ... |
... |
@@ -38,6 +38,7 @@ tags = "remote-settings" |
|
38
|
38
|
["test_async.js"]
|
|
39
|
39
|
|
|
40
|
40
|
["test_base_browser.js"]
|
|
|
41
|
+tags = "base-browser"
|
|
41
|
42
|
|
|
42
|
43
|
["test_configExpansion.js"]
|
|
43
|
44
|
support-files = [
|
| ... |
... |
@@ -206,6 +207,7 @@ support-files = [ |
|
206
|
207
|
|
|
207
|
208
|
["test_security_level.js"]
|
|
208
|
209
|
prefs = ["browser.security_level.security_slider=1"]
|
|
|
210
|
+tags = "base-browser"
|
|
209
|
211
|
|
|
210
|
212
|
["test_selectedEngine.js"]
|
|
211
|
213
|
|
|