[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 2 commits: fixup! BB 41803: Add some developer tools for working on tor-browser.

28 Aug 2025


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


Commits:
36c2b42c by Beatriz Rizental at 2025-08-28T13:39:19+02:00
fixup! BB 41803: Add some developer tools for working on tor-browser.

- - - - -
cf409afb by Beatriz Rizental at 2025-08-28T13:40:28+02:00
fixup! Add CI for Base Browser

- - - - -


19 changed files:

- .gitlab-ci.yml
- .gitlab/ci/jobs/lint/helpers.py → .gitlab/ci/jobs/helpers.py
- .gitlab/ci/jobs/lint/lint.yml
- + .gitlab/ci/jobs/test/python-test.yml
- .gitlab/ci/jobs/update-translations.yml
- − tools/base-browser/l10n/combine/tests/README
- tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor
- tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py
- tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py
- tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py
- tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py
- + tools/base_browser/l10n/combine/tests/python.toml
- tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py
- tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py
- tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py
- tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py
- tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py
- tools/base-browser/tb-dev → tools/base_browser/tb-dev
- tools/moz.build


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1,6 +1,7 @@
 stages:
   - update-container-images
   - lint
+  - test
   - startup-test
   - update-translations
 
@@ -11,6 +12,7 @@ variables:
 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'


=====================================
.gitlab/ci/jobs/lint/helpers.py → .gitlab/ci/jobs/helpers.py
=====================================
@@ -112,7 +112,7 @@ if __name__ == "__main__":
     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",
     )


=====================================
.gitlab/ci/jobs/lint/lint.yml
=====================================
@@ -18,7 +18,7 @@ lint-all:
     - 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


=====================================
.gitlab/ci/jobs/test/python-test.yml
=====================================
@@ -0,0 +1,24 @@
+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"


=====================================
.gitlab/ci/jobs/update-translations.yml
=====================================
@@ -102,7 +102,7 @@ combine-en-US-translations:
     # 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


=====================================
tools/base-browser/l10n/combine/tests/README deleted
=====================================
@@ -1,2 +0,0 @@
-python tests to be run with pytest.
-Requires the compare-locales package.


=====================================
tools/base-browser/git-rebase-fixup-preprocessor → tools/base_browser/git-rebase-fixup-preprocessor
=====================================


=====================================
tools/base-browser/l10n/combine-translation-versions.py → tools/base_browser/l10n/combine-translation-versions.py
=====================================


=====================================
tools/base-browser/l10n/combine/__init__.py → tools/base_browser/l10n/combine/__init__.py
=====================================


=====================================
tools/base-browser/l10n/combine/combine.py → tools/base_browser/l10n/combine/combine.py
=====================================


=====================================
tools/base-browser/l10n/combine/tests/__init__.py → tools/base_browser/l10n/combine/tests/__init__.py
=====================================


=====================================
tools/base_browser/l10n/combine/tests/python.toml
=====================================
@@ -0,0 +1,10 @@
+[DEFAULT]
+subsuite = "base-browser"
+
+["test_android.py"]
+
+["test_dtd.py"]
+
+["test_fluent.py"]
+
+["test_properties.py"]


=====================================
tools/base-browser/l10n/combine/tests/test_android.py → tools/base_browser/l10n/combine/tests/test_android.py
=====================================
@@ -1,6 +1,7 @@
 import textwrap
 
-from combine import combine_files
+import mozunit
+from base_browser.l10n.combine import combine_files
 
 
 def wrap_in_xml(content):
@@ -413,3 +414,7 @@ def test_alternatives():
         <string name="string_4_alt">Other string</string>
         """,
     )
+
+
+if __name__ == "__main__":
+    mozunit.main()


=====================================
tools/base-browser/l10n/combine/tests/test_dtd.py → tools/base_browser/l10n/combine/tests/test_dtd.py
=====================================
@@ -1,6 +1,7 @@
 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):
@@ -411,3 +412,7 @@ def test_alternatives():
         <!ENTITY string.4.alt "Other string">
         """,
     )
+
+
+if __name__ == "__main__":
+    mozunit.main()


=====================================
tools/base-browser/l10n/combine/tests/test_fluent.py → tools/base_browser/l10n/combine/tests/test_fluent.py
=====================================
@@ -1,6 +1,7 @@
 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):
@@ -475,3 +476,7 @@ def test_alternatives():
         -string-4-alt = Other string
         """,
     )
+
+
+if __name__ == "__main__":
+    mozunit.main()


=====================================
tools/base-browser/l10n/combine/tests/test_properties.py → tools/base_browser/l10n/combine/tests/test_properties.py
=====================================
@@ -1,6 +1,7 @@
 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):
@@ -408,3 +409,7 @@ def test_alternatives():
         string.4.alt = Other string
         """,
     )
+
+
+if __name__ == "__main__":
+    mozunit.main()


=====================================
tools/base-browser/missing-css-variables.py → tools/base_browser/missing-css-variables.py
=====================================


=====================================
tools/base-browser/tb-dev → tools/base_browser/tb-dev
=====================================


=====================================
tools/moz.build
=====================================
@@ -71,6 +71,7 @@ with Files("tryselect/docs/**"):
     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",



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

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/acb6048...
You're receiving this email because of your account on gitlab.torproject.org.

    

brizental (＠brizental)

tags

participants (1)