mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2024-12-19 21:17:54 +00:00
basedir fixup
This commit is contained in:
parent
5d6a76ffee
commit
548d9cbbcc
@ -42,14 +42,14 @@ def testing_tub(config_data=''):
|
|||||||
config = config_from_string(config_data, 'DEFAULT_PORTNUMFILE_BLANK', basedir)
|
config = config_from_string(config_data, 'DEFAULT_PORTNUMFILE_BLANK', basedir)
|
||||||
fileutil.make_dirs(os.path.join(basedir, 'private'))
|
fileutil.make_dirs(os.path.join(basedir, 'private'))
|
||||||
|
|
||||||
i2p_provider = create_i2p_provider(reactor, basedir, config)
|
i2p_provider = create_i2p_provider(reactor, config)
|
||||||
tor_provider = create_tor_provider(reactor, basedir, config)
|
tor_provider = create_tor_provider(reactor, config)
|
||||||
handlers = create_connection_handlers(reactor, basedir, config, i2p_provider, tor_provider)
|
handlers = create_connection_handlers(reactor, config, i2p_provider, tor_provider)
|
||||||
default_connection_handlers, foolscap_connection_handlers = handlers
|
default_connection_handlers, foolscap_connection_handlers = handlers
|
||||||
tub_options = create_tub_options(config)
|
tub_options = create_tub_options(config)
|
||||||
|
|
||||||
main_tub, is_listening = create_main_tub(
|
main_tub, is_listening = create_main_tub(
|
||||||
basedir, config, tub_options, default_connection_handlers,
|
config, tub_options, default_connection_handlers,
|
||||||
foolscap_connection_handlers, i2p_provider, tor_provider,
|
foolscap_connection_handlers, i2p_provider, tor_provider,
|
||||||
cert_filename='DEFAULT_CERTFILE_BLANK'
|
cert_filename='DEFAULT_CERTFILE_BLANK'
|
||||||
)
|
)
|
||||||
@ -487,11 +487,6 @@ class TestMissingPorts(unittest.TestCase):
|
|||||||
self.failUnless(ns.called)
|
self.failUnless(ns.called)
|
||||||
|
|
||||||
|
|
||||||
class EmptyNode(Node):
|
|
||||||
def __init__(self):
|
|
||||||
config = config_from_string("", "no portfile", 'no basedir')
|
|
||||||
Node.__init__(self, config, 'no basedir')
|
|
||||||
|
|
||||||
EXPECTED = {
|
EXPECTED = {
|
||||||
# top-level key is tub.port category
|
# top-level key is tub.port category
|
||||||
"missing": {
|
"missing": {
|
||||||
|
Loading…
Reference in New Issue
Block a user