brizental pushed to branch tor-browser-146.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 5ca6dda1 by Beatriz Rizental at 2025-12-17T10:45:07-03:00 fixup! TB 43817: Add tests for Tor Browser Bug 43243: Rename marionette.toml to manifest.toml just for consistency sake. All other marionette manifest files are named that. - - - - - 27ece0a4 by Beatriz Rizental at 2025-12-17T10:45:19-03:00 fixup! TB 43817: Add tests for Tor Browser Bug 43243: Make it possible to run all tor test just by using tags. Just adding the tag wasn't enough though, had to add it to a list of tests in integration-tests.toml. Might be an upstream bug, but I don't feel like debugging that. Also it's easy enough. - - - - - ea62300f by Beatriz Rizental at 2025-12-17T10:45:26-03:00 fixup! TB 43817: Add tests for Tor Browser Bug 43243: iInclude testing/tor directory into common test archive. - - - - - 3349d936 by Beatriz Rizental at 2025-12-17T10:45:35-03:00 fixup! TB 43817: Add tests for Tor Browser Bug 43243: BUGFIX: Make it possible to run both tor browser tests in sequence. Turns out they need to explicitly close the browser, otherwise marionette doesn't do that for us unless it's the end of the whole suite. We want a restart, because we want to bootstrap before each test. - - - - - 6 changed files: - python/mozbuild/mozbuild/action/test_archive.py - testing/marionette/harness/marionette_harness/tests/integration-tests.toml - testing/moz.build - testing/tor/marionette.toml → testing/tor/manifest.toml - testing/tor/test_circuit_isolation.py - testing/tor/test_network_check.py Changes: ===================================== python/mozbuild/mozbuild/action/test_archive.py ===================================== @@ -229,6 +229,12 @@ ARCHIVE_FILES = { "pattern": "**", "dest": "certs", }, + { + "source": buildconfig.topsrcdir, + "base": "", + "pattern": "testing/tor", + "dest": "tor", + }, ], "cppunittest": [ {"source": STAGE, "base": "", "pattern": "cppunittest/**"}, ===================================== testing/marionette/harness/marionette_harness/tests/integration-tests.toml ===================================== @@ -56,6 +56,10 @@ ["include:../../../../../netwerk/test/marionette/manifest.toml"] +# tor tests + +["include:../../../../../testing/tor/manifest.toml"] + # toolkit tests ["include:../../../../../toolkit/components/antitracking/bouncetrackingprotection/test/marionette/manifest.toml"] ===================================== testing/moz.build ===================================== @@ -18,4 +18,4 @@ PERFTESTS_MANIFESTS += [ "performance/perftest.toml", ] -MARIONETTE_MANIFESTS += ["tor/marionette.toml"] +MARIONETTE_MANIFESTS += ["tor/manifest.toml"] ===================================== testing/tor/marionette.toml → testing/tor/manifest.toml ===================================== @@ -1,4 +1,5 @@ [DEFAULT] +tags = "tor" ["test_circuit_isolation.py"] ===================================== testing/tor/test_circuit_isolation.py ===================================== @@ -8,6 +8,9 @@ TOR_BOOTSTRAP_TIMEOUT = 30000 # 30s class TestCircuitIsolation(MarionetteTestCase): + def tearDown(self): + self.marionette.restart(in_app=False, clean=True) + super(TestCircuitIsolation, self).tearDown() def bootstrap(self): with self.marionette.using_context("chrome"): ===================================== testing/tor/test_network_check.py ===================================== @@ -14,6 +14,10 @@ class TestNetworkCheck(MarionetteTestCase): self.l10n = L10n(self.marionette) + def tearDown(self): + self.marionette.restart(in_app=False, clean=True) + super(TestNetworkCheck, self).tearDown() + def attemptConnection(self, tries=1): if tries > 3: self.assertTrue(False, "Failed to connect to Tor after 3 attempts") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b05a0c0... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b05a0c0... You're receiving this email because of your account on gitlab.torproject.org.