GitLab

at 2025-08-28T13:39:19+02:00

fixup! BB 41803: Add some developer tools for working on tor-browser.

fixup! Add CI for Base Browser

 stages:

   - update-container-images

   - lint

+  - test

   - startup-test

   - update-translations

 include:

   - local: '.gitlab/ci/mixins.yml'

   - local: '.gitlab/ci/jobs/lint/lint.yml'

+  - local: '.gitlab/ci/jobs/test/python-test.yml'

   - local: '.gitlab/ci/jobs/startup-test/startup-test.yml'

   - local: '.gitlab/ci/jobs/update-containers.yml'

   - local: '.gitlab/ci/jobs/update-translations.yml'
     parser.add_argument(

         "--get-changed-files",

         help="Get list of changed files."

-        "When running from a merge request get sthe list of changed files since the merge-base of the current branch."

+        "When running from a merge request gets the list of changed files since the merge-base of the current branch."

         "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.",

         action="store_true",

     )

     - firefox

   script:

     - ./mach configure --with-base-browser-version=0.0.0

-    - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v

+    - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v

   rules:

     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

     # Run job whenever a commit is merged to a protected branch

+python-test:

+  extends: .with-local-repo-bash

+  stage: test

+  image: $IMAGE_PATH

+  interruptible: true

+  variables:

+    MOZBUILD_STATE_PATH: "/var/tmp/mozbuild"

+  cache:

+    paths:

+      - node_modules

+    # Store the cache regardless on job outcome

+    when: 'always'

+    # Share the cache throughout all pipelines running for a given branch

+    key: $CI_COMMIT_REF_SLUG

+  tags:

+    # Run these jobs in the browser dedicated runners.

+    - firefox

+  script:

+    - ./mach configure --with-base-browser-version=0.0.0

+    - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach python-test -v

+  rules:

+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' && $CI_PIPELINE_SOURCE == 'push')

+      changes:

+        - "**/test_*.py"
     # push-en-US-translations job.

     - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env

     - pip install compare_locales

-    - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON"

+    - python ./tools/base_browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON"

 push-en-US-translations:

   extends: .update-translation-base

-python tests to be run with pytest.

-Requires the compare-locales package.
+[DEFAULT]

+subsuite = "base-browser"

+

+["test_android.py"]

+

+["test_dtd.py"]

+

+["test_fluent.py"]

+

+["test_properties.py"]
 import textwrap

-from combine import combine_files

+import mozunit

+from base_browser.l10n.combine import combine_files

 def wrap_in_xml(content):

         <string name="string_4_alt">Other string</string>

         """,

     )

+

+

+if __name__ == "__main__":

+    mozunit.main()
 import textwrap

-from combine import combine_files

+import mozunit

+from base_browser.l10n.combine import combine_files

 def assert_result(new_content, old_content, expect):

         <!ENTITY string.4.alt "Other string">

         """,

     )

+

+

+if __name__ == "__main__":

+    mozunit.main()
 import textwrap

-from combine import combine_files

+import mozunit

+from base_browser.l10n.combine import combine_files

 def assert_result(new_content, old_content, expect):

         -string-4-alt = Other string

         """,

     )

+

+

+if __name__ == "__main__":

+    mozunit.main()
 import textwrap

-from combine import combine_files

+import mozunit

+from base_browser.l10n.combine import combine_files

 def assert_result(new_content, old_content, expect):

         string.4.alt = Other string

         """,

     )

+

+

+if __name__ == "__main__":

+    mozunit.main()
     SCHEDULES.exclusive = ["docs"]

 PYTHON_UNITTEST_MANIFESTS += [

+    "base_browser/l10n/combine/tests/python.toml",

     "fuzzing/smoke/python.toml",

     "lint/test/python.toml",

     "tryselect/test/python.toml",

brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

19 changed files:

Changes:

1		-python tests to be run with pytest.
2		-Requires the compare-locales package.