[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] 6 commits: fixup! BB 40925: Implemented the Security Level component

22 Jun 2026


      brizental pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser


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:

- testing/mozharness/configs/android/android_common.py
- testing/mozharness/configs/unittests/linux_unittest.py
- testing/mozharness/configs/unittests/mac_unittest.py
- testing/mozharness/configs/unittests/win_unittest.py
- testing/mozharness/scripts/desktop_unittest.py
- toolkit/components/search/tests/xpcshell/xpcshell.toml


Changes:

=====================================
testing/mozharness/configs/android/android_common.py
=====================================
@@ -9,8 +9,8 @@
 
 import os
 
-NODEJS_PATH = None
-if "MOZ_FETCHES_DIR" in os.environ:
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
     NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
 
 


=====================================
testing/mozharness/configs/unittests/linux_unittest.py
=====================================
@@ -19,8 +19,8 @@ ADJUST_MOUSE_AND_SCREEN = False
 # Note: keep these Valgrind .sup file names consistent with those
 # in testing/mochitest/mochitest_options.py.
 VALGRIND_SUPP_DIR = os.path.join(os.getcwd(), "build/tests/mochitest")
-NODEJS_PATH = None
-if "MOZ_FETCHES_DIR" in os.environ:
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
     NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
 
 VALGRIND_SUPP_CROSS_ARCH = os.path.join(VALGRIND_SUPP_DIR, "cross-architecture.sup")


=====================================
testing/mozharness/configs/unittests/mac_unittest.py
=====================================
@@ -3,12 +3,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
-import sys
 
 # OS Specifics
 INSTALLER_PATH = os.path.join(os.getcwd(), "installer.dmg")
-NODEJS_PATH = None
-if "MOZ_FETCHES_DIR" in os.environ:
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
     NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/bin/node")
 
 XPCSHELL_NAME = "xpcshell"
@@ -202,45 +201,8 @@ config = {
             "halt_on_failure": True,
             "enabled": True,
         },
-        {
-            "name": "kill_dock",
-            "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,
-        },
+        # tor-browser-bundle-testsuite#40107: Skip environment configurations
+        # from upstream that are unnecessary in our CI setup.
     ],
     "vcs_output_timeout": 1000,
     "minidump_save_path": "%(abs_work_dir)s/../minidumps",


=====================================
testing/mozharness/configs/unittests/win_unittest.py
=====================================
@@ -9,9 +9,9 @@ import sys
 # OS Specifics
 ABS_WORK_DIR = os.path.join(os.getcwd(), "build")
 BINARY_PATH = os.path.join(ABS_WORK_DIR, "firefox", "firefox.exe")
-INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.zip")
-NODEJS_PATH = None
-if "MOZ_FETCHES_DIR" in os.environ:
+INSTALLER_PATH = os.path.join(ABS_WORK_DIR, "installer.exe")
+NODEJS_PATH = os.environ.get("NODEJS_PATH")
+if NODEJS_PATH is None and "MOZ_FETCHES_DIR" in os.environ:
     NODEJS_PATH = os.path.join(os.environ["MOZ_FETCHES_DIR"], "node/node.exe")
 
 REQUIRE_GPU = False
@@ -22,7 +22,7 @@ USE_HARDWARE = False
 if "USE_HARDWARE" in os.environ:
     USE_HARDWARE = os.environ["USE_HARDWARE"] == "1"
 
-PYWIN32 = "pywin32==306"
+PYWIN32 = "pywin32==312"
 
 XPCSHELL_NAME = "xpcshell.exe"
 EXE_SUFFIX = ".exe"
@@ -222,38 +222,8 @@ config = {
             "halt_on_failure": False,
             "enabled": DISABLE_SCREEN_SAVER,
         },
-        {
-            "name": "run mouse & screen adjustment script",
-            "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,
-        },
+        # tor-browser-bundle-testsuite#40107: Skip environment configurations
+        # from upstream that are unnecessary in our CI setup.
         {
             "name": "enable microphone access for msix",
             "cmd": [


=====================================
testing/mozharness/scripts/desktop_unittest.py
=====================================
@@ -639,13 +639,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
                     symbols_url = self.installer_url.replace(
                         ext, ".crashreporter-symbols.zip"
                     )
-            if not symbols_url:
-                self.fatal(
-                    "self.installer_url was found but symbols_url could \
-                        not be determined"
-                )
-        else:
-            self.fatal("self.installer_url was not found in self.config")
+        # tor-browser-bundle-testsuite#40107: Do not error if unable to set symbols URL.
+        # We do not generate symbols for all platforms and the symbols we do generate are
+        # not at the expected places. We may enable this in the future, but it's not
+        # a priority at the moment.
         self.info("setting symbols_url as %s" % (symbols_url))
         self.symbols_url = symbols_url
         return self.symbols_url


=====================================
toolkit/components/search/tests/xpcshell/xpcshell.toml
=====================================
@@ -38,6 +38,7 @@ tags = "remote-settings"
 ["test_async.js"]
 
 ["test_base_browser.js"]
+tags = "base-browser"
 
 ["test_configExpansion.js"]
 support-files = [
@@ -206,6 +207,7 @@ support-files = [
 
 ["test_security_level.js"]
 prefs = ["browser.security_level.security_slider=1"]
+tags = "base-browser"
 
 ["test_selectedEngine.js"]
 



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a19cb20...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a19cb20...
You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

    

brizental (＠brizental)

tags

participants (1)