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
-
27ece0a4
by Beatriz Rizental at 2025-12-17T10:45:19-03:00
-
ea62300f
by Beatriz Rizental at 2025-12-17T10:45:26-03:00
-
3349d936
by Beatriz Rizental at 2025-12-17T10:45:35-03:00
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:
| ... | ... | @@ -229,6 +229,12 @@ ARCHIVE_FILES = { |
| 229 | 229 | "pattern": "**",
|
| 230 | 230 | "dest": "certs",
|
| 231 | 231 | },
|
| 232 | + {
|
|
| 233 | + "source": buildconfig.topsrcdir,
|
|
| 234 | + "base": "",
|
|
| 235 | + "pattern": "testing/tor",
|
|
| 236 | + "dest": "tor",
|
|
| 237 | + },
|
|
| 232 | 238 | ],
|
| 233 | 239 | "cppunittest": [
|
| 234 | 240 | {"source": STAGE, "base": "", "pattern": "cppunittest/**"},
|
| ... | ... | @@ -56,6 +56,10 @@ |
| 56 | 56 | |
| 57 | 57 | ["include:../../../../../netwerk/test/marionette/manifest.toml"]
|
| 58 | 58 | |
| 59 | +# tor tests
|
|
| 60 | + |
|
| 61 | +["include:../../../../../testing/tor/manifest.toml"]
|
|
| 62 | + |
|
| 59 | 63 | # toolkit tests
|
| 60 | 64 | |
| 61 | 65 | ["include:../../../../../toolkit/components/antitracking/bouncetrackingprotection/test/marionette/manifest.toml"]
|
| ... | ... | @@ -18,4 +18,4 @@ PERFTESTS_MANIFESTS += [ |
| 18 | 18 | "performance/perftest.toml",
|
| 19 | 19 | ]
|
| 20 | 20 | |
| 21 | -MARIONETTE_MANIFESTS += ["tor/marionette.toml"] |
|
| 21 | +MARIONETTE_MANIFESTS += ["tor/manifest.toml"] |
| 1 | 1 | [DEFAULT]
|
| 2 | +tags = "tor"
|
|
| 2 | 3 | |
| 3 | 4 | ["test_circuit_isolation.py"]
|
| 4 | 5 |
| ... | ... | @@ -8,6 +8,9 @@ TOR_BOOTSTRAP_TIMEOUT = 30000 # 30s |
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 | class TestCircuitIsolation(MarionetteTestCase):
|
| 11 | + def tearDown(self):
|
|
| 12 | + self.marionette.restart(in_app=False, clean=True)
|
|
| 13 | + super(TestCircuitIsolation, self).tearDown()
|
|
| 11 | 14 | |
| 12 | 15 | def bootstrap(self):
|
| 13 | 16 | with self.marionette.using_context("chrome"):
|
| ... | ... | @@ -14,6 +14,10 @@ class TestNetworkCheck(MarionetteTestCase): |
| 14 | 14 | |
| 15 | 15 | self.l10n = L10n(self.marionette)
|
| 16 | 16 | |
| 17 | + def tearDown(self):
|
|
| 18 | + self.marionette.restart(in_app=False, clean=True)
|
|
| 19 | + super(TestNetworkCheck, self).tearDown()
|
|
| 20 | + |
|
| 17 | 21 | def attemptConnection(self, tries=1):
|
| 18 | 22 | if tries > 3:
|
| 19 | 23 | self.assertTrue(False, "Failed to connect to Tor after 3 attempts")
|