From 71ced4c228f799aa96985e8eee5b763c7a08d0cd Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Wed, 16 Dec 2020 11:03:37 -0500 Subject: [PATCH] Duplicate of allmydata.test.test_tor_provider.Provider.test_handler_socks_endpoint --- src/allmydata/test/test_connections.py | 11 ----------- src/allmydata/test/test_tor_provider.py | 4 ++++ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/allmydata/test/test_connections.py b/src/allmydata/test/test_connections.py index 2e936a2df..6e4a84e5e 100644 --- a/src/allmydata/test/test_connections.py +++ b/src/allmydata/test/test_connections.py @@ -67,17 +67,6 @@ class CreateConnectionHandlersTests(SyncTestCase): class Tor(unittest.TestCase): - def test_default(self): - h1 = mock.Mock() - with mock.patch("foolscap.connections.tor.default_socks", - return_value=h1) as f: - - config = config_from_string("fake.port", "no-basedir", BASECONFIG) - tor_provider = create_tor_provider(reactor, config) - h = tor_provider.get_tor_handler() - self.assertEqual(f.mock_calls, [mock.call()]) - self.assertIdentical(h, h1) - def _do_test_launch(self, executable): # the handler is created right away config = BASECONFIG+"[tor]\nlaunch = true\n" diff --git a/src/allmydata/test/test_tor_provider.py b/src/allmydata/test/test_tor_provider.py index bfc962831..c6d950632 100644 --- a/src/allmydata/test/test_tor_provider.py +++ b/src/allmydata/test/test_tor_provider.py @@ -349,6 +349,10 @@ class Provider(unittest.TestCase): cfs2.assert_called_with(reactor, ep_desc) def test_handler_socks_endpoint(self): + """ + If not configured otherwise, the Tor provider returns a Socks-based + handler. + """ tor = mock.Mock() handler = object() tor.socks_endpoint = mock.Mock(return_value=handler)