mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-06-18 15:28:12 +00:00
put create() methods in i2p_, tor_provider
Also Provider -> _Provider, improve docs and update tests
This commit is contained in:
meejah
@ -286,22 +286,20 @@ class EmptyContext(object):
|
||||
|
||||
class Provider(unittest.TestCase):
|
||||
def test_build(self):
|
||||
tor_provider.Provider(FakeConfig(), "reactor")
|
||||
tor_provider.create("reactor", FakeConfig())
|
||||
|
||||
def test_handler_disabled(self):
|
||||
p = tor_provider.Provider(FakeConfig(enabled=False),
|
||||
"reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig(enabled=False))
|
||||
self.assertEqual(p.get_tor_handler(), None)
|
||||
|
||||
def test_handler_no_tor(self):
|
||||
with mock_tor(None):
|
||||
p = tor_provider.Provider(FakeConfig(), "reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig())
|
||||
self.assertEqual(p.get_tor_handler(), None)
|
||||
|
||||
def test_handler_launch_no_txtorcon(self):
|
||||
with mock_txtorcon(None):
|
||||
p = tor_provider.Provider(FakeConfig(launch=True),
|
||||
"reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig(launch=True))
|
||||
self.assertEqual(p.get_tor_handler(), None)
|
||||
|
||||
@defer.inlineCallbacks
|
||||
@ -314,8 +312,7 @@ class Provider(unittest.TestCase):
|
||||
tor.add_context = mock.Mock(return_value=EmptyContext())
|
||||
with mock_tor(tor):
|
||||
with mock_txtorcon(txtorcon):
|
||||
p = tor_provider.Provider(FakeConfig(launch=True),
|
||||
reactor)
|
||||
p = tor_provider.create(reactor, FakeConfig(launch=True))
|
||||
h = p.get_tor_handler()
|
||||
self.assertIs(h, handler)
|
||||
tor.control_endpoint_maker.assert_called_with(p._make_control_endpoint,
|
||||
@ -360,8 +357,8 @@ class Provider(unittest.TestCase):
|
||||
reactor = object()
|
||||
|
||||
with mock_tor(tor):
|
||||
p = tor_provider.Provider(FakeConfig(**{"socks.port": "ep_desc"}),
|
||||
reactor)
|
||||
p = tor_provider.create(reactor,
|
||||
FakeConfig(**{"socks.port": "ep_desc"}))
|
||||
with mock.patch("allmydata.util.tor_provider.clientFromString", cfs):
|
||||
h = p.get_tor_handler()
|
||||
cfs.assert_called_with(reactor, "ep_desc")
|
||||
@ -377,8 +374,8 @@ class Provider(unittest.TestCase):
|
||||
reactor = object()
|
||||
|
||||
with mock_tor(tor):
|
||||
p = tor_provider.Provider(FakeConfig(**{"control.port": "ep_desc"}),
|
||||
reactor)
|
||||
p = tor_provider.create(reactor,
|
||||
FakeConfig(**{"control.port": "ep_desc"}))
|
||||
with mock.patch("allmydata.util.tor_provider.clientFromString", cfs):
|
||||
h = p.get_tor_handler()
|
||||
self.assertIs(h, handler)
|
||||
@ -391,7 +388,7 @@ class Provider(unittest.TestCase):
|
||||
tor.default_socks = mock.Mock(return_value=handler)
|
||||
|
||||
with mock_tor(tor):
|
||||
p = tor_provider.Provider(FakeConfig(), "reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig())
|
||||
h = p.get_tor_handler()
|
||||
self.assertIs(h, handler)
|
||||
tor.default_socks.assert_called_with()
|
||||
@ -408,8 +405,8 @@ class ProviderListener(unittest.TestCase):
|
||||
reactor = object()
|
||||
|
||||
with mock_tor(tor):
|
||||
p = tor_provider.Provider(FakeConfig(**{"onion.local_port": "321"}),
|
||||
reactor)
|
||||
p = tor_provider.create(reactor,
|
||||
FakeConfig(**{"onion.local_port": "321"}))
|
||||
fake_ep = object()
|
||||
with mock.patch("allmydata.util.tor_provider.TCP4ServerEndpoint",
|
||||
return_value=fake_ep) as e:
|
||||
@ -423,62 +420,78 @@ class Provider_CheckOnionConfig(unittest.TestCase):
|
||||
# default config doesn't start an onion service, so it should be
|
||||
# happy both with and without txtorcon
|
||||
|
||||
p = tor_provider.Provider(FakeConfig(), "reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig())
|
||||
p.check_onion_config()
|
||||
|
||||
with mock_txtorcon(None):
|
||||
p = tor_provider.Provider(FakeConfig(), "reactor")
|
||||
p = tor_provider.create("reactor", FakeConfig())
|
||||
p.check_onion_config()
|
||||
|
||||
def test_no_txtorcon(self):
|
||||
with mock_txtorcon(None):
|
||||
p = tor_provider.Provider(FakeConfig(onion=True),
|
||||
"reactor")
|
||||
e = self.assertRaises(ValueError, p.check_onion_config)
|
||||
self.assertEqual(str(e), "Cannot create onion without txtorcon. "
|
||||
"Please 'pip install tahoe-lafs[tor]' to fix.")
|
||||
with self.assertRaises(ValueError) as ctx:
|
||||
tor_provider.create("reactor", FakeConfig(onion=True))
|
||||
self.assertEqual(
|
||||
str(ctx.exception),
|
||||
"Cannot create onion without txtorcon. "
|
||||
"Please 'pip install tahoe-lafs[tor]' to fix."
|
||||
)
|
||||
|
||||
def test_no_launch_no_control(self):
|
||||
p = tor_provider.Provider(FakeConfig(onion=True), "reactor")
|
||||
e = self.assertRaises(ValueError, p.check_onion_config)
|
||||
self.assertEqual(str(e), "[tor] onion = true, but we have neither "
|
||||
"launch=true nor control.port=")
|
||||
with self.assertRaises(ValueError) as ctx:
|
||||
tor_provider.create("reactor", FakeConfig(onion=True))
|
||||
self.assertEqual(
|
||||
str(ctx.exception),
|
||||
"[tor] onion = true, but we have neither "
|
||||
"launch=true nor control.port="
|
||||
)
|
||||
|
||||
def test_missing_keys(self):
|
||||
p = tor_provider.Provider(FakeConfig(onion=True,
|
||||
launch=True), "reactor")
|
||||
e = self.assertRaises(ValueError, p.check_onion_config)
|
||||
self.assertEqual(str(e), "[tor] onion = true, "
|
||||
"but onion.local_port= is missing")
|
||||
def test_missing_keys0(self):
|
||||
with self.assertRaises(ValueError) as ctx:
|
||||
tor_provider.create("reactor", FakeConfig(onion=True, launch=True))
|
||||
self.assertEqual(
|
||||
str(ctx.exception),
|
||||
"[tor] onion = true, "
|
||||
"but onion.local_port= is missing"
|
||||
)
|
||||
|
||||
p = tor_provider.Provider(FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
}), "reactor")
|
||||
e = self.assertRaises(ValueError, p.check_onion_config)
|
||||
self.assertEqual(str(e), "[tor] onion = true, "
|
||||
"but onion.external_port= is missing")
|
||||
def test_missing_keys1(self):
|
||||
with self.assertRaises(ValueError) as ctx:
|
||||
tor_provider.create("reactor",
|
||||
FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
}))
|
||||
self.assertEqual(
|
||||
str(ctx.exception),
|
||||
"[tor] onion = true, but onion.external_port= is missing"
|
||||
)
|
||||
|
||||
p = tor_provider.Provider(FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
"onion.external_port": "y",
|
||||
}), "reactor")
|
||||
e = self.assertRaises(ValueError, p.check_onion_config)
|
||||
self.assertEqual(str(e), "[tor] onion = true, "
|
||||
"but onion.private_key_file= is missing")
|
||||
def test_missing_keys2(self):
|
||||
with self.assertRaises(ValueError) as ctx:
|
||||
tor_provider.create("reactor",
|
||||
FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
"onion.external_port": "y",
|
||||
}))
|
||||
self.assertEqual(
|
||||
str(ctx.exception),
|
||||
"[tor] onion = true, but onion.private_key_file= is missing"
|
||||
)
|
||||
|
||||
def test_ok(self):
|
||||
p = tor_provider.Provider(FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
"onion.external_port": "y",
|
||||
"onion.private_key_file": "z",
|
||||
}), "reactor")
|
||||
p = tor_provider.create("reactor",
|
||||
FakeConfig(onion=True, launch=True,
|
||||
**{"onion.local_port": "x",
|
||||
"onion.external_port": "y",
|
||||
"onion.private_key_file": "z",
|
||||
}))
|
||||
p.check_onion_config()
|
||||
|
||||
class Provider_Service(unittest.TestCase):
|
||||
def test_no_onion(self):
|
||||
reactor = object()
|
||||
p = tor_provider.Provider(FakeConfig(onion=False), reactor)
|
||||
with mock.patch("allmydata.util.tor_provider.Provider._start_onion") as s:
|
||||
p = tor_provider.create(reactor, FakeConfig(onion=False))
|
||||
with mock.patch("allmydata.util.tor_provider._Provider._start_onion") as s:
|
||||
p.startService()
|
||||
self.assertEqual(s.mock_calls, [])
|
||||
self.assertEqual(p.running, True)
|
||||
@ -502,7 +515,7 @@ class Provider_Service(unittest.TestCase):
|
||||
|
||||
txtorcon = mock.Mock()
|
||||
with mock_txtorcon(txtorcon):
|
||||
p = tor_provider.Provider(cfg, reactor)
|
||||
p = tor_provider.create(reactor, basedir, cfg)
|
||||
tor_state = mock.Mock()
|
||||
tor_state.protocol = object()
|
||||
ehs = mock.Mock()
|
||||
@ -543,7 +556,7 @@ class Provider_Service(unittest.TestCase):
|
||||
|
||||
txtorcon = mock.Mock()
|
||||
with mock_txtorcon(txtorcon):
|
||||
p = tor_provider.Provider(cfg, reactor)
|
||||
p = tor_provider.create(reactor, basedir, cfg)
|
||||
tor_state = mock.Mock()
|
||||
tor_state.protocol = object()
|
||||
txtorcon.build_tor_connection = mock.Mock(return_value=tor_state)
|
||||
|
||||
Reference in New Issue
Block a user