- tbb-commits - lists.torproject.org

[tor-browser-bundle-testsuite/master] Fix onion location test issue in 81
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 120a97eb4b3c0250ce4613a8f314dcd3841430fb Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Aug 27 22:10:27 2020 +0200 Fix onion location test issue in 81 --- .../tor_browser_tests/test_onion_location.py | 36 ++++++++++++++-------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/marionette/tor_browser_tests/test_onion_location.py b/marionette/tor_browser_tests/test_onion_location.py index 1188250..d028d04 100644 --- a/marionette/tor_browser_tests/test_onion_location.py +++ b/marionette/tor_browser_tests/test_onion_location.py @@ -5,6 +5,16 @@ from marionette_harness import MarionetteTestCase, WindowManagerMixin class Test(WindowManagerMixin, MarionetteTestCase): + # To be investigated in #40007: + # In 81, marionette.get_url() sometimes fails with: + # `UnknownException: TypeError: browsingContext.currentWindowGlobal is null` + # It happens when clicking "Always Prioritize Onions" in the doorhanger: + # opens a new tab + refreshes the previous one, then when we close the new tab + # and move to the old one, marionette.get_url() throws the error. + # Until a proper fix, this workaround seems to work fine. + def get_url(self): + with self.marionette.using_context('content'): + return self.marionette.execute_script("return document.location.href;") def test_onion_location(self): m = self.marionette @@ -39,9 +49,9 @@ class Test(WindowManagerMixin, MarionetteTestCase): lambda _: len(m.window_handles) > 1) m.switch_to_window(m.window_handles[1]) Wait(m, timeout=m.timeout.page_load).until( - lambda _: m.get_url() != "about:blank") + lambda _: self.get_url() != "about:blank") self.assertEqual( - m.get_url(), "https://tb-manual.torproject.org/onion-services/") + self.get_url(), "https://tb-manual.torproject.org/onion-services/") m.close() m.switch_to_window(m.window_handles[0]) @@ -74,23 +84,23 @@ class Test(WindowManagerMixin, MarionetteTestCase): with m.using_context('content'): m.switch_to_window(m.window_handles[1]) self.assertEqual( - m.get_url(), 'about:preferences#privacy-onionservices') + self.get_url(), 'about:preferences#privacy-onionservices') m.close() m.switch_to_window(self.start_tab) # Check that the original page is redirected to .onion Wait(m, timeout=m.timeout.page_load).until( - lambda _: m.get_url() != 'https://www.torproject.org/') + lambda _: self.get_url() != 'https://www.torproject.org/') self.assertEqual( - m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + self.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') # Check that auto-redirects work m.navigate('https://www.torproject.org/') - self.assertEqual(m.get_url(), 'https://www.torproject.org/') + self.assertEqual(self.get_url(), 'https://www.torproject.org/') Wait(m, timeout=m.timeout.page_load).until( - lambda _: m.get_url() != 'https://www.torproject.org/') + lambda _: self.get_url() != 'https://www.torproject.org/') self.assertEqual( - m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + self.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') # Go to preferences and disable auto-redirects new_tab = self.open_tab() @@ -103,7 +113,7 @@ class Test(WindowManagerMixin, MarionetteTestCase): m.switch_to_window(self.start_tab) m.navigate('https://www.torproject.org/') try: - Wait(m, timeout=5).until(lambda _: m.get_url() + Wait(m, timeout=5).until(lambda _: self.get_url() != 'https://www.torproject.org/') self.assertTrue(False, "Should not redirect") except TimeoutException: @@ -115,10 +125,10 @@ class Test(WindowManagerMixin, MarionetteTestCase): 'id', 'onion-location-box').is_displayed()) m.find_element('id', 'onion-location-box').click() with m.using_context('content'): - Wait(m, timeout=5).until(lambda _: m.get_url() + Wait(m, timeout=5).until(lambda _: self.get_url() != 'https://www.torproject.org/') self.assertEqual( - m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + self.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') # Check learn more link with m.using_context('content'): @@ -128,8 +138,8 @@ class Test(WindowManagerMixin, MarionetteTestCase): lambda _: len(m.window_handles) > 1) m.switch_to_window(m.window_handles[1]) Wait(m, timeout=m.timeout.page_load).until( - lambda _: m.get_url() != "about:blank") + lambda _: self.get_url() != "about:blank") self.assertEqual( - m.get_url(), "https://tb-manual.torproject.org/onion-services/") + self.get_url(), "https://tb-manual.torproject.org/onion-services/") m.close() m.switch_to_window(m.window_handles[0])

1 0

[tor-browser-bundle-testsuite/master] Bug 40001: Add test for 'Communicating security expectations TB patch'
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit a6c55026833dbdb0a7769d7352579fd796e7573c Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 29 19:37:00 2020 +0200 Bug 40001: Add test for 'Communicating security expectations TB patch' --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 6 + marionette/setup.py | 1 + .../test_onion_security_expectations.py | 134 +++++++++++++++++++++ test-data/mixed.html | 8 ++ test-data/mixed_active.html | 8 ++ 5 files changed, 157 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 4a8908e..834641e 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -476,6 +476,12 @@ our @tests = ( # Bug 30432: temporarily disable test enable => sub { undef }, }, + { + name => 'onion_security_expectations', + type => 'marionette', + use_net => 1, + descr => 'Check onion security expectations', + }, ); sub set_test_prefs { diff --git a/marionette/setup.py b/marionette/setup.py index 78f4522..9dc9772 100644 --- a/marionette/setup.py +++ b/marionette/setup.py @@ -5,6 +5,7 @@ PACKAGE_VERSION = '0.3' deps = [ 'marionette_harness == 5.0.0', 'marionette_driver == 3.0.0', + 'stem == 1.8.0', ] setup(name='tor-browser-tests', diff --git a/marionette/tor_browser_tests/test_onion_security_expectations.py b/marionette/tor_browser_tests/test_onion_security_expectations.py new file mode 100644 index 0000000..866ae1e --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_security_expectations.py @@ -0,0 +1,134 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver.legacy_actions import Actions +from marionette_harness import MarionetteTestCase, WindowManagerMixin + +import testsuite + +from stem.control import Controller + +from urlparse import urlparse + +import time + +class OnionFixturesMixin(object): + def setUp(self): + super(OnionFixturesMixin, self).setUp() + tor_control_port = testsuite.TestSuite( + ).t['options']['tor-control-port'] + with Controller.from_port(port=int(tor_control_port)) as controller: + controller.authenticate() + port = urlparse(self.marionette.absolute_url('')).port + response = controller.create_ephemeral_hidden_service( + {80: port}, + key_content='ED25519-V3', + await_publication=True, + detached=True, + ) + self.service_id = response.service_id + + def tearDown(self): + tor_control_port = testsuite.TestSuite( + ).t['options']['tor-control-port'] + with Controller.from_port(port=int(tor_control_port)) as controller: + controller.authenticate() + controller.remove_ephemeral_hidden_service(self.service_id) + super(OnionFixturesMixin, self).tearDown() + + +class Test(OnionFixturesMixin, WindowManagerMixin, MarionetteTestCase): + def get_identity_class(self): + with self.marionette.using_context('chrome'): + return self.marionette.execute_script(''' + return document.getElementById("identity-box").className; + ''') + + def get_identity_icon(self): + with self.marionette.using_context('chrome'): + return self.marionette.execute_script(''' + const el = document.getElementById("identity-icon"); + return document.defaultView.getComputedStyle(el)["list-style-image"]; + ''') + + def get_connection_type(self): + m = self.marionette + with self.marionette.using_context('chrome'): + self.execute_chrome( + 'document.getElementById("identity-popup-more-info").click()') + m.switch_to_window(m.chrome_window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.find_element('id', 'security-technical-shortform').text != '') + text = m.find_element('id', 'security-technical-shortform').text + m.close_chrome_window() + m.switch_to_window(self.start_window) + return text + + def execute_chrome(self, script): + with self.marionette.using_context('chrome'): + return self.marionette.execute_script(script) + + def test_onion_security_expectations(self): + m = self.marionette + m.timeout.implicit = 10 + + # Wait some more time to make sure the onion service is set up + time.sleep(10) + + # Regular onion + with m.using_context('content'): + m.navigate('http://' + self.service_id + '.onion') + self.assertTrue(self.execute_chrome( + "return !!gIdentityHandler._isSecureConnection;")) + self.assertEqual(self.get_identity_class(), 'onionUnknownIdentity') + self.assertEqual(self.get_connection_type(), + 'Connection Encrypted (Onion Service)') + self.assertEqual(self.get_identity_icon(), + 'url("chrome://browser/skin/onion.svg")') + + # Onion with mixed display content + with m.using_context('content'): + m.navigate('http://' + self.service_id + '.onion/mixed.html') + self.assertFalse(self.execute_chrome( + "return !!gIdentityHandler._isSecureConnection;")) + self.assertEqual(self.get_identity_class(), + 'onionUnknownIdentity onionMixedDisplayContent') + self.assertEqual(self.get_connection_type(), + 'Connection Partially Encrypted') + self.assertEqual(self.get_identity_icon(), + 'url("chrome://browser/skin/onion-warning.svg")') + + # Onion with mixed active content + with m.using_context('content'): + m.navigate('http://' + self.service_id + + '.onion/mixed_active.html') + self.assertTrue(self.execute_chrome( + "return !!gIdentityHandler._isSecureConnection;")) + self.assertEqual(self.get_identity_class(), 'onionUnknownIdentity') + self.assertEqual(self.get_connection_type(), + 'Connection Encrypted (Onion Service)') + self.assertEqual(self.get_identity_icon(), + 'url("chrome://browser/skin/onion.svg")') + # Reload with mixed content protection disabled + self.execute_chrome( + 'gIdentityHandler.disableMixedContentProtection();') + Wait(m, timeout=m.timeout.page_load).until( + lambda _: self.get_identity_class() != 'onionUnknownIdentity') + self.assertFalse(self.execute_chrome( + "return !!gIdentityHandler._isSecureConnection;")) + self.assertEqual(self.get_identity_class(), + 'onionUnknownIdentity onionMixedActiveContent') + self.assertEqual(self.get_connection_type(), + 'Connection Partially Encrypted') + self.assertEqual(self.get_identity_icon(), + 'url("chrome://browser/skin/onion-slash.svg")') + + # Onion with valid TLS certificate + with m.using_context('content'): + m.navigate('https://3g2upl4pq6kufc4m.onion/') + self.assertTrue(self.execute_chrome( + "return !!gIdentityHandler._isSecureConnection;")) + self.assertEqual(self.get_identity_class(), 'onionVerifiedDomain') + self.assertEqual(self.get_connection_type( + ), 'Connection Encrypted (Onion Service, TLS_AES_256_GCM_SHA384, 256 bit keys, TLS 1.3)') + self.assertEqual(self.get_identity_icon(), + 'url("chrome://browser/skin/onion.svg")') diff --git a/test-data/mixed.html b/test-data/mixed.html new file mode 100644 index 0000000..3de98a1 --- /dev/null +++ b/test-data/mixed.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> + <head> + </head> + <body> + <img src="http://www.torproject.org/static/images/tor-logo@2x.png"/> + </body> +</html> diff --git a/test-data/mixed_active.html b/test-data/mixed_active.html new file mode 100644 index 0000000..23430ab --- /dev/null +++ b/test-data/mixed_active.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> + <head> + </head> + <body> + <iframe src="http://www.torproject.org"></iframe> + </body> +</html>

1 0

[tor-browser-bundle-testsuite/master] Disable navigation timing test for >= 79
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 0f220abf788eb987e5b158d0b376d2f88c6907e2 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Aug 3 15:45:25 2020 +0200 Disable navigation timing test for >= 79 --- marionette/tor_browser_tests/test_navigation-timing.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/marionette/tor_browser_tests/test_navigation-timing.py b/marionette/tor_browser_tests/test_navigation-timing.py index 0b0c125..9d38697 100644 --- a/marionette/tor_browser_tests/test_navigation-timing.py +++ b/marionette/tor_browser_tests/test_navigation-timing.py @@ -7,11 +7,12 @@ from marionette_driver import By from marionette_driver.errors import MarionetteException from marionette_harness import MarionetteTestCase +import testsuite -class Test(MarionetteTestCase): +class Test(testsuite.TorBrowserTest): def setUp(self): - MarionetteTestCase.setUp(self) + testsuite.TorBrowserTest.setUp(self) self.TEST_URL = "https://www.mediawiki.org/wiki/MediaWiki" @@ -40,6 +41,9 @@ class Test(MarionetteTestCase): } def test_navigation_timing(self): + if (self.get_version() >= 79): + # Navigation timing was reenabled in 79 (https://bugzilla.mozilla.org/show_bug.cgi?id=1637985) + return with self.marionette.using_context('content'): self.marionette.navigate(self.TEST_URL)

1 0

[tor-browser-bundle-testsuite/master] Fix slider settings test for 78.2
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 3c2da7d966cf1a2eb02812d5ab05eea774a84359 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 26 16:24:12 2020 +0200 Fix slider settings test for 78.2 --- marionette/tor_browser_tests/test_slider_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/marionette/tor_browser_tests/test_slider_settings.py b/marionette/tor_browser_tests/test_slider_settings.py index 290482e..f61ad21 100644 --- a/marionette/tor_browser_tests/test_slider_settings.py +++ b/marionette/tor_browser_tests/test_slider_settings.py @@ -20,7 +20,6 @@ class Test(MarionetteTestCase): "javascript.options.ion" : [ 0, False, False, False, True ], "javascript.options.baselinejit" : [ 0, False, False, False, True ], "javascript.options.native_regexp" : [ 0, False, False, False, True ], - "media.webaudio.enabled" : [ 0, False, False, False, True ], "mathml.disabled" : [ 0, True, True, True, False], "gfx.font_rendering.opentype_svg.enabled" : [ 0, False, False, True, True ], "svg.disabled" : [ 0, True, False, False, False],

1 0

[tor-browser-bundle-testsuite/master] Bug 40005: Add test for 'Replace security slider with security level UI' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit d97948001366242e3baab4d49dd0706cf42aa8ab Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 29 19:56:14 2020 +0200 Bug 40005: Add test for 'Replace security slider with security level UI' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 6 ++ .../tor_browser_tests/test_security_level_ui.py | 72 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 931ab70..37efae6 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -494,6 +494,12 @@ our @tests = ( use_net => 1, descr => 'Check that onion alias urlbar rewrites work properly', }, + { + name => 'security_level_ui', + type => 'marionette', + use_net => 1, + descr => 'Check that the security level UI is working properly', + }, ); sub set_test_prefs { diff --git a/marionette/tor_browser_tests/test_security_level_ui.py b/marionette/tor_browser_tests/test_security_level_ui.py new file mode 100644 index 0000000..f24e7ea --- /dev/null +++ b/marionette/tor_browser_tests/test_security_level_ui.py @@ -0,0 +1,72 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException + +from marionette_harness import MarionetteTestCase + + +class Test(MarionetteTestCase): + def test_security_level_ui(self): + custom_pref = 'javascript.options.wasm' + m = self.marionette + m.timeout.implicit = 5 + with m.using_context('chrome'): + m.find_element('id', 'security-level-button').click() + m.find_element( + 'id', 'securityLevel-advancedSecuritySettings').click() + with m.using_context('content'): + # Test whether changing the security level value works + self.assertEqual( + m.get_url(), "about:preferences#privacy-securitylevel") + self.assertEqual(4, m.get_pref( + 'extensions.torbutton.security_slider')) + m.find_element( + 'css selector', '#securityLevel-vbox-safer radio').click() + self.assertEqual(2, m.get_pref( + 'extensions.torbutton.security_slider')) + m.find_element( + 'css selector', '#securityLevel-vbox-safest radio').click() + self.assertEqual(1, m.get_pref( + 'extensions.torbutton.security_slider')) + m.find_element( + 'css selector', '#securityLevel-vbox-standard radio').click() + self.assertEqual(4, m.get_pref( + 'extensions.torbutton.security_slider')) + + # Test custom security settings + elem = m.find_element('id', 'securityLevel-restoreDefaults') + self.assertEqual(elem.is_displayed(), False) + m.set_pref(custom_pref, False) + self.assertEqual(elem.is_displayed(), True) + elem.click() + self.assertEqual(True, m.get_pref(custom_pref)) + + # Test Learn More link + m.find_element('id', 'securityLevel-learnMore').click() + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 1) + m.switch_to_window(m.window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != "about:blank") + self.assertTrue( + m.get_url() in ["https://tb-manual.torproject.org/en-US/security-settings/", "https://tb-manual.torproject.org/security-settings/"]) + + # Test Learn More link from panel + m.find_element('id', 'security-level-button').click() + m.find_element('id', 'securityLevel-learnMore').click() + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 2) + with m.using_context('content'): + m.switch_to_window(m.window_handles[2]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != "about:blank") + self.assertTrue( + m.get_url() in ["https://tb-manual.torproject.org/en-US/security-settings/", "https://tb-manual.torproject.org/security-settings/"]) + + # Test custom settings from panel + m.set_pref(custom_pref, False) + elem = m.find_element('id', 'securityLevel-restoreDefaults') + self.assertEqual(elem.is_displayed(), False) + m.find_element('id', 'security-level-button').click() + self.assertEqual(elem.is_displayed(), True) + elem.click() + self.assertEqual(True, m.get_pref(custom_pref))

1 0

[tor-browser-bundle-testsuite/master] Fix onion alias test for same reason as previous commit
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit d582cb8edb59ba625c24586a2b8b202a83440e11 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Aug 27 22:28:26 2020 +0200 Fix onion alias test for same reason as previous commit --- marionette/tor_browser_tests/test_onion_alias.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/marionette/tor_browser_tests/test_onion_alias.py b/marionette/tor_browser_tests/test_onion_alias.py index 1495906..39dcc49 100644 --- a/marionette/tor_browser_tests/test_onion_alias.py +++ b/marionette/tor_browser_tests/test_onion_alias.py @@ -7,6 +7,10 @@ import time class Test(WindowManagerMixin, MarionetteTestCase): + def get_url(self): + with self.marionette.using_context('content'): + return self.marionette.execute_script("return document.location.href;") + def get_urlbar_value(self): with self.marionette.using_context('chrome'): return self.marionette.execute_script("return gURLBar.value;") @@ -23,7 +27,7 @@ class Test(WindowManagerMixin, MarionetteTestCase): with m.using_context('content'): # Navigating to a known .tor.onion should redirect and rewrite the urlbar with the alias. m.navigate('http://theintercept.securedrop.tor.onion') - self.assertEqual(m.get_url( + self.assertEqual(self.get_url( ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') self.assertEqual(self.get_urlbar_value(), 'theintercept.securedrop.tor.onion') @@ -46,8 +50,8 @@ class Test(WindowManagerMixin, MarionetteTestCase): lambda _: len(m.window_handles) > 1) m.switch_to_window(m.window_handles[1]) Wait(m, timeout=m.timeout.page_load).until( - lambda _: m.get_url() != 'about:blank') - self.assertEqual(m.get_url( + lambda _: self.get_url() != 'about:blank') + self.assertEqual(self.get_url( ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/gener…') self.assertEqual(self.get_urlbar_value(), 'theintercept.securedrop.tor.onion/generate') @@ -59,7 +63,7 @@ class Test(WindowManagerMixin, MarionetteTestCase): m.switch_to_window(new_tab) m.navigate( 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion') - self.assertEqual(m.get_url( + self.assertEqual(self.get_url( ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') self.assertEqual(self.get_urlbar_value( ), 'xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion')

1 0

[tor-browser-bundle-testsuite/master] Fix dom objects enumeration tests for 80
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit ab71188e49358619bfe06a2b618200b2f5e5b68f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Aug 3 12:18:15 2020 +0200 Fix dom objects enumeration tests for 80 --- marionette/tor_browser_tests/lib/testsuite.py | 7 +++++++ .../test_dom-objects-enumeration-worker.py | 15 +++++++++++---- .../tor_browser_tests/test_dom-objects-enumeration.py | 16 ++++++++++++---- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/marionette/tor_browser_tests/lib/testsuite.py b/marionette/tor_browser_tests/lib/testsuite.py index 78713c8..88b1953 100644 --- a/marionette/tor_browser_tests/lib/testsuite.py +++ b/marionette/tor_browser_tests/lib/testsuite.py @@ -1,5 +1,6 @@ import os import json +from marionette_harness import MarionetteTestCase class TestSuite(object): def __init__(self): @@ -24,3 +25,9 @@ class TestSuite(object): output = open(screenshot_file, 'w') output.write(png_data) output.close() + + +class TorBrowserTest(MarionetteTestCase): + def get_version(self): + with self.marionette.using_context("chrome"): + return self.marionette.execute_script("return parseFloat(AppConstants.MOZ_APP_VERSION);") diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py index 59d771b..88f5792 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py @@ -1,9 +1,10 @@ from marionette_harness import MarionetteTestCase +import testsuite -class Test(MarionetteTestCase): +class Test(testsuite.TorBrowserTest): def setUp(self): - MarionetteTestCase.setUp(self) + testsuite.TorBrowserTest.setUp(self) self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=worker") @@ -196,8 +197,14 @@ class Test(MarionetteTestCase): "XMLHttpRequestEventTarget", "XMLHttpRequestUpload", ] + self.expectedObjects80 = self.expectedObjects + ["AggregateError", "FinalizationRegistry", "WeakRef"] + self.expectedObjects80.sort() def test_dom_objects_enumeration_workers(self): + expectedObjects = self.expectedObjects + if self.get_version() >= 80: + expectedObjects = self.expectedObjects80 + with self.marionette.using_context('content'): self.marionette.navigate(self.test_page_file_url) self.marionette.timeout.implicit = 5 @@ -206,7 +213,7 @@ class Test(MarionetteTestCase): err = False unknown_objects = '' for l in r: - if l in self.expectedObjects: + if l in expectedObjects: continue err = True unknown_objects += l + "\n" @@ -214,7 +221,7 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) - for l in self.expectedObjects: + for l in expectedObjects: if l in r: continue err = True diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index be2ae65..3db4366 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -8,10 +8,11 @@ from marionette_driver import By from marionette_driver.errors import MarionetteException from marionette_harness import MarionetteTestCase +import testsuite -class Test(MarionetteTestCase): +class Test(testsuite.TorBrowserTest): def setUp(self): - MarionetteTestCase.setUp(self) + testsuite.TorBrowserTest.setUp(self) self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) self.test_page_file_url = self.marionette.absolute_url("dom-objects-enumeration.html?testType=window") # The list of expected DOM objects @@ -753,8 +754,15 @@ class Test(MarionetteTestCase): "XPathResult", "XSLTProcessor", ] + self.expectedObjects80 = self.expectedObjects + ["AggregateError", "FinalizationRegistry", "WeakRef"] + self.expectedObjects80.remove("content") + self.expectedObjects80.sort() def test_dom_objects_enumeration(self): + expectedObjects = self.expectedObjects + if self.get_version() >= 80: + expectedObjects = self.expectedObjects80 + with self.marionette.using_context('content'): self.marionette.navigate(self.test_page_file_url) self.marionette.timeout.implicit = 5 @@ -763,7 +771,7 @@ class Test(MarionetteTestCase): err = False unknown_objects = '' for l in r: - if l in self.expectedObjects: + if l in expectedObjects: continue err = True unknown_objects += l + "\n" @@ -771,7 +779,7 @@ class Test(MarionetteTestCase): err_msg = "Unknown objects:\n%s" % unknown_objects self.assertFalse(err, msg=err_msg) - for l in self.expectedObjects: + for l in expectedObjects: if l in r: continue err = True

1 0

[tor-browser-bundle-testsuite/master] Cleanup skip_files lists in BrowserBundleTests.pm
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 9eccab9ce7b5ac0b05dd8cd2986a2a52323e1925 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 14 16:25:57 2020 +0200 Cleanup skip_files lists in BrowserBundleTests.pm --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 49 ---------------------------- 1 file changed, 49 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 7d6c110..8cf64ce 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -52,36 +52,7 @@ our @tests = ( enable => sub { $_[0]->{os} eq 'Windows' }, # ticket 16417 skip_files => [ qw( - TorBrowser/Tor/PluggableTransports/_ctypes.pyd - TorBrowser/Tor/PluggableTransports/_hashlib.pyd - TorBrowser/Tor/PluggableTransports/_socket.pyd - TorBrowser/Tor/PluggableTransports/_ssl.pyd - TorBrowser/Tor/PluggableTransports/bz2.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Cipher._AES.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Hash._SHA256.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Hash._SHA512.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Random.OSRNG.winrandom.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Util._counter.pyd - TorBrowser/Tor/PluggableTransports/Crypto.Util.strxor.pyd - TorBrowser/Tor/PluggableTransports/flashproxy-client.exe - TorBrowser/Tor/PluggableTransports/flashproxy-reg-appspot.exe - TorBrowser/Tor/PluggableTransports/flashproxy-reg-email.exe - TorBrowser/Tor/PluggableTransports/flashproxy-reg-http.exe - TorBrowser/Tor/PluggableTransports/flashproxy-reg-url.exe - TorBrowser/Tor/PluggableTransports/fte.cDFA.pyd - TorBrowser/Tor/PluggableTransports/fteproxy.exe - TorBrowser/Tor/PluggableTransports/M2Crypto.__m2crypto.pyd - TorBrowser/Tor/PluggableTransports/meek-client-torbrowser.exe - TorBrowser/Tor/PluggableTransports/meek-client.exe TorBrowser/Tor/PluggableTransports/obfs4proxy.exe - TorBrowser/Tor/PluggableTransports/obfsproxy.exe - TorBrowser/Tor/PluggableTransports/pyexpat.pyd - TorBrowser/Tor/PluggableTransports/python27.dll - TorBrowser/Tor/PluggableTransports/select.pyd - TorBrowser/Tor/PluggableTransports/terminateprocess-buffer.exe - TorBrowser/Tor/PluggableTransports/unicodedata.pyd - TorBrowser/Tor/PluggableTransports/w9xpopen.exe - TorBrowser/Tor/PluggableTransports/zope.interface._zope_interface_coptimizations.pyd ) ], }, { @@ -94,11 +65,7 @@ our @tests = ( && ( $_[0] =~ m/BIND_NOW/ ) }, enable => sub { $OSNAME eq 'linux' }, skip_files => [ qw( - TorBrowser/Tor/PluggableTransports/meek-client - TorBrowser/Tor/PluggableTransports/meek-client-torbrowser - TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy - TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so TorBrowser/Tor/PluggableTransports/snowflake-client TorBrowser/ncprop279/ncprop279 ) ], @@ -115,21 +82,9 @@ our @tests = ( skip_files => [ qw( abicheck gtk2/libmozgtk.so - libmozalloc.so libmozgtk.so libplc4.so - libplds4.so TorBrowser/Tor/libstdc++/libstdc++.so.6 - TorBrowser/Tor/PluggableTransports/Crypto/Cipher/_ARC4.so - TorBrowser/Tor/PluggableTransports/Crypto/Cipher/_XOR.so - TorBrowser/Tor/PluggableTransports/Crypto/Util/_counter.so - TorBrowser/Tor/PluggableTransports/fte/cDFA.so - TorBrowser/Tor/PluggableTransports/meek-client-torbrowser - TorBrowser/Tor/PluggableTransports/twisted/python/_initgroups.so - TorBrowser/Tor/PluggableTransports/twisted/runner/portmap.so - TorBrowser/Tor/PluggableTransports/twisted/test/raiser.so - TorBrowser/Tor/PluggableTransports/zope/interface/_zope_interface_coptimizations.so - TorBrowser/Tor/PluggableTransports/meek-client TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/snowflake-client TorBrowser/ncprop279/ncprop279 @@ -156,8 +111,6 @@ our @tests = ( check_output => sub { $_[0] =~ m/Type:\s+DYN/ }, enable => sub { $OSNAME eq 'linux' }, skip_files => [ qw( - TorBrowser/Tor/PluggableTransports/meek-client - TorBrowser/Tor/PluggableTransports/meek-client-torbrowser TorBrowser/Tor/PluggableTransports/obfs4proxy TorBrowser/Tor/PluggableTransports/snowflake-client TorBrowser/ncprop279/ncprop279 @@ -200,8 +153,6 @@ our @tests = ( enable => sub { $OSNAME eq 'darwin' }, retry => 1, skip_files => [ qw( - Contents/MacOS/Tor/PluggableTransports/meek-client - Contents/MacOS/Tor/PluggableTransports/meek-client-torbrowser Contents/MacOS/Tor/PluggableTransports/obfs4proxy ) ], },

1 0

[tor-browser-bundle-testsuite/master] Cleanup tests python imports
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 71bce1264f10e8f184095aad54cf27e81f56a7a4 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 14 18:16:10 2020 +0200 Cleanup tests python imports --- marionette/tor_browser_tests/test_acid3.py | 6 +----- marionette/tor_browser_tests/test_check.py | 3 --- .../tor_browser_tests/test_dom-objects-enumeration-worker.py | 1 - marionette/tor_browser_tests/test_dom-objects-enumeration.py | 4 ---- marionette/tor_browser_tests/test_download_pdf.py | 2 -- marionette/tor_browser_tests/test_fp_navigator.py | 4 ---- marionette/tor_browser_tests/test_fp_plugins.py | 3 --- marionette/tor_browser_tests/test_fp_screen_coords.py | 4 ---- marionette/tor_browser_tests/test_fp_screen_dimensions.py | 3 --- marionette/tor_browser_tests/test_fp_useragent.py | 4 ---- marionette/tor_browser_tests/test_fpcentral.py | 5 ----- marionette/tor_browser_tests/test_navigation-timing.py | 4 ---- marionette/tor_browser_tests/test_noscript.py | 5 +---- marionette/tor_browser_tests/test_onion_alias.py | 6 +----- marionette/tor_browser_tests/test_onion_client_auth.py | 11 ++--------- marionette/tor_browser_tests/test_onion_location.py | 6 ++---- .../tor_browser_tests/test_onion_security_expectations.py | 10 ++-------- marionette/tor_browser_tests/test_page.py | 2 -- marionette/tor_browser_tests/test_pinning.py | 3 +-- marionette/tor_browser_tests/test_resource-timing.py | 3 --- marionette/tor_browser_tests/test_screenshots.py | 4 ---- marionette/tor_browser_tests/test_searchengines.py | 5 ----- marionette/tor_browser_tests/test_security_level_ui.py | 5 +---- marionette/tor_browser_tests/test_settings.py | 5 ----- marionette/tor_browser_tests/test_slider_settings.py | 5 ----- marionette/tor_browser_tests/test_svg.py | 4 +--- marionette/tor_browser_tests/test_user-timing.py | 3 --- 27 files changed, 12 insertions(+), 108 deletions(-) diff --git a/marionette/tor_browser_tests/test_acid3.py b/marionette/tor_browser_tests/test_acid3.py index 9fa043b..c0f2e78 100644 --- a/marionette/tor_browser_tests/test_acid3.py +++ b/marionette/tor_browser_tests/test_acid3.py @@ -1,11 +1,7 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException - +from marionette_driver import Wait from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_check.py b/marionette/tor_browser_tests/test_check.py index dfe4abf..3d067a9 100755 --- a/marionette/tor_browser_tests/test_check.py +++ b/marionette/tor_browser_tests/test_check.py @@ -1,6 +1,3 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py index 88f5792..5d21d1b 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration-worker.py @@ -1,4 +1,3 @@ -from marionette_harness import MarionetteTestCase import testsuite class Test(testsuite.TorBrowserTest): diff --git a/marionette/tor_browser_tests/test_dom-objects-enumeration.py b/marionette/tor_browser_tests/test_dom-objects-enumeration.py index 3db4366..143a554 100644 --- a/marionette/tor_browser_tests/test_dom-objects-enumeration.py +++ b/marionette/tor_browser_tests/test_dom-objects-enumeration.py @@ -4,10 +4,6 @@ # This test has been suggested in the iSEC partners' report: # https://blog.torproject.org/blog/isec-partners-conducts-tor-browser-hardeni… -from marionette_driver import By -from marionette_driver.errors import MarionetteException - -from marionette_harness import MarionetteTestCase import testsuite class Test(testsuite.TorBrowserTest): diff --git a/marionette/tor_browser_tests/test_download_pdf.py b/marionette/tor_browser_tests/test_download_pdf.py index 408f63a..6025a64 100644 --- a/marionette/tor_browser_tests/test_download_pdf.py +++ b/marionette/tor_browser_tests/test_download_pdf.py @@ -1,8 +1,6 @@ from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_fp_navigator.py b/marionette/tor_browser_tests/test_fp_navigator.py index 1453b0f..91dc951 100644 --- a/marionette/tor_browser_tests/test_fp_navigator.py +++ b/marionette/tor_browser_tests/test_fp_navigator.py @@ -1,8 +1,4 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite # expected values for navigation properties diff --git a/marionette/tor_browser_tests/test_fp_plugins.py b/marionette/tor_browser_tests/test_fp_plugins.py index 3f51d61..45981ca 100644 --- a/marionette/tor_browser_tests/test_fp_plugins.py +++ b/marionette/tor_browser_tests/test_fp_plugins.py @@ -1,6 +1,3 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_fp_screen_coords.py b/marionette/tor_browser_tests/test_fp_screen_coords.py index 208430b..97c2767 100644 --- a/marionette/tor_browser_tests/test_fp_screen_coords.py +++ b/marionette/tor_browser_tests/test_fp_screen_coords.py @@ -1,7 +1,3 @@ - -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_fp_screen_dimensions.py b/marionette/tor_browser_tests/test_fp_screen_dimensions.py index 879f5c2..2e0af6d 100644 --- a/marionette/tor_browser_tests/test_fp_screen_dimensions.py +++ b/marionette/tor_browser_tests/test_fp_screen_dimensions.py @@ -1,6 +1,3 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_fp_useragent.py b/marionette/tor_browser_tests/test_fp_useragent.py index a2ef986..5b32bb3 100644 --- a/marionette/tor_browser_tests/test_fp_useragent.py +++ b/marionette/tor_browser_tests/test_fp_useragent.py @@ -1,8 +1,4 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_fpcentral.py b/marionette/tor_browser_tests/test_fpcentral.py index a698155..a7c8020 100644 --- a/marionette/tor_browser_tests/test_fpcentral.py +++ b/marionette/tor_browser_tests/test_fpcentral.py @@ -1,11 +1,6 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_navigation-timing.py b/marionette/tor_browser_tests/test_navigation-timing.py index 9d38697..ce3cb57 100644 --- a/marionette/tor_browser_tests/test_navigation-timing.py +++ b/marionette/tor_browser_tests/test_navigation-timing.py @@ -3,10 +3,6 @@ # Tor Browser. Setting |dom.enable_performance| to |false| and testing that has # been not sufficient. See bug 13186 for further details. -from marionette_driver import By -from marionette_driver.errors import MarionetteException - -from marionette_harness import MarionetteTestCase import testsuite class Test(testsuite.TorBrowserTest): diff --git a/marionette/tor_browser_tests/test_noscript.py b/marionette/tor_browser_tests/test_noscript.py index 8083098..7d3d274 100644 --- a/marionette/tor_browser_tests/test_noscript.py +++ b/marionette/tor_browser_tests/test_noscript.py @@ -1,10 +1,7 @@ # https://trac.torproject.org/projects/tor/ticket/13053 -from marionette_driver import By -from marionette_driver.errors import MarionetteException, NoSuchElementException - +from marionette_driver.errors import NoSuchElementException from marionette_harness import MarionetteTestCase - import testsuite class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_onion_alias.py b/marionette/tor_browser_tests/test_onion_alias.py index 39dcc49..8f1dc67 100644 --- a/marionette/tor_browser_tests/test_onion_alias.py +++ b/marionette/tor_browser_tests/test_onion_alias.py @@ -1,11 +1,7 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver import Wait from marionette_driver.legacy_actions import Actions from marionette_harness import MarionetteTestCase, WindowManagerMixin -import time - - class Test(WindowManagerMixin, MarionetteTestCase): def get_url(self): with self.marionette.using_context('content'): diff --git a/marionette/tor_browser_tests/test_onion_client_auth.py b/marionette/tor_browser_tests/test_onion_client_auth.py index 38c8a34..1686fa7 100644 --- a/marionette/tor_browser_tests/test_onion_client_auth.py +++ b/marionette/tor_browser_tests/test_onion_client_auth.py @@ -1,21 +1,14 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException -from marionette_driver.legacy_actions import Actions +from marionette_driver import Wait from marionette_harness import MarionetteTestCase, WindowManagerMixin - -import testsuite - from stem.control import Controller from stem.process import launch_tor_with_config - from urlparse import urlparse from tempfile import mkdtemp import shutil import os import base64 - import time - +import testsuite class Test(WindowManagerMixin, MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_onion_location.py b/marionette/tor_browser_tests/test_onion_location.py index d028d04..37acb2d 100644 --- a/marionette/tor_browser_tests/test_onion_location.py +++ b/marionette/tor_browser_tests/test_onion_location.py @@ -1,9 +1,7 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException - +from marionette_driver import Wait +from marionette_driver.errors import NoSuchElementException, TimeoutException from marionette_harness import MarionetteTestCase, WindowManagerMixin - class Test(WindowManagerMixin, MarionetteTestCase): # To be investigated in #40007: # In 81, marionette.get_url() sometimes fails with: diff --git a/marionette/tor_browser_tests/test_onion_security_expectations.py b/marionette/tor_browser_tests/test_onion_security_expectations.py index 866ae1e..7a0fd27 100644 --- a/marionette/tor_browser_tests/test_onion_security_expectations.py +++ b/marionette/tor_browser_tests/test_onion_security_expectations.py @@ -1,15 +1,9 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException -from marionette_driver.legacy_actions import Actions +from marionette_driver import Wait from marionette_harness import MarionetteTestCase, WindowManagerMixin - -import testsuite - from stem.control import Controller - from urlparse import urlparse - import time +import testsuite class OnionFixturesMixin(object): def setUp(self): diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index 3d1f4cc..f1369c5 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -1,8 +1,6 @@ from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_pinning.py b/marionette/tor_browser_tests/test_pinning.py index 23e029c..5641e7a 100644 --- a/marionette/tor_browser_tests/test_pinning.py +++ b/marionette/tor_browser_tests/test_pinning.py @@ -1,7 +1,6 @@ from marionette_harness import MarionetteTestCase - -import testsuite import json +import testsuite class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_resource-timing.py b/marionette/tor_browser_tests/test_resource-timing.py index e143f0c..9660725 100644 --- a/marionette/tor_browser_tests/test_resource-timing.py +++ b/marionette/tor_browser_tests/test_resource-timing.py @@ -3,9 +3,6 @@ # Tor Browser. Setting |dom.enable_resource_timing| to |false| and testing that # might not be sufficient. -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_screenshots.py b/marionette/tor_browser_tests/test_screenshots.py index b7cc3d6..4fac52e 100755 --- a/marionette/tor_browser_tests/test_screenshots.py +++ b/marionette/tor_browser_tests/test_screenshots.py @@ -1,8 +1,4 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_searchengines.py b/marionette/tor_browser_tests/test_searchengines.py index eeb2c6b..9f394f7 100644 --- a/marionette/tor_browser_tests/test_searchengines.py +++ b/marionette/tor_browser_tests/test_searchengines.py @@ -6,14 +6,9 @@ # case while the search engines are still not properly ordered. Rather, we # check the entries in the search box directly. -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_security_level_ui.py b/marionette/tor_browser_tests/test_security_level_ui.py index f24e7ea..740934f 100644 --- a/marionette/tor_browser_tests/test_security_level_ui.py +++ b/marionette/tor_browser_tests/test_security_level_ui.py @@ -1,9 +1,6 @@ -from marionette_driver import By, Wait -from marionette_driver.errors import MarionetteException - +from marionette_driver import Wait from marionette_harness import MarionetteTestCase - class Test(MarionetteTestCase): def test_security_level_ui(self): custom_pref = 'javascript.options.wasm' diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py index b0a9be4..f24cdd0 100644 --- a/marionette/tor_browser_tests/test_settings.py +++ b/marionette/tor_browser_tests/test_settings.py @@ -1,11 +1,6 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_slider_settings.py b/marionette/tor_browser_tests/test_slider_settings.py index f61ad21..9b1101a 100644 --- a/marionette/tor_browser_tests/test_slider_settings.py +++ b/marionette/tor_browser_tests/test_slider_settings.py @@ -1,11 +1,6 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - import testsuite - class Test(MarionetteTestCase): def setUp(self): diff --git a/marionette/tor_browser_tests/test_svg.py b/marionette/tor_browser_tests/test_svg.py index af55b1b..7dfd120 100644 --- a/marionette/tor_browser_tests/test_svg.py +++ b/marionette/tor_browser_tests/test_svg.py @@ -1,7 +1,5 @@ -from marionette_driver.errors import MarionetteException, JavascriptException, NoSuchElementException - +from marionette_driver.errors import JavascriptException from marionette_harness import MarionetteTestCase - import testsuite class Test(MarionetteTestCase): diff --git a/marionette/tor_browser_tests/test_user-timing.py b/marionette/tor_browser_tests/test_user-timing.py index 9ad56e1..46a74f2 100644 --- a/marionette/tor_browser_tests/test_user-timing.py +++ b/marionette/tor_browser_tests/test_user-timing.py @@ -3,9 +3,6 @@ # Tor Browser. Setting |dom.enable_user_timing| to |false| and testing that # might not be sufficient. -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase class Test(MarionetteTestCase):

1 0

[tor-android-service/master] Bug 40003: Setup Tor in the main thread
by sysrqb＠torproject.org 15 Oct '20

15 Oct '20

commit 8213c8dc9868dead7c3b2e34c80d29934939e2ee Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 15 02:50:59 2020 +0000 Bug 40003: Setup Tor in the main thread --- .../main/java/org/torproject/android/service/TorService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index 971c2e9..f1ddcda 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -234,13 +234,10 @@ public final class TorService extends Service implements TorServiceConstants, Or mActionBroadcastReceiver = new ActionBroadcastReceiver(); registerReceiver(mActionBroadcastReceiver, new IntentFilter(CMD_NEWNYM)); - new Thread(new Runnable() { - public void run() { - if (setupTor()) { - notifyIfConnectedToTorNetwork(); - } - } - }).start(); + if (setupTor()) { + mEventBroadcaster.broadcastNotice("Preparing Tor, please wait..."); + notifyIfConnectedToTorNetwork(); + } Log.i("TorService", "onCreate end"); }

1 0