ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 21:17:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

basedir/config fixup

Browse Source
This commit is contained in:
meejah 2018-01-31 13:02:30 -07:00
parent 7685fb34cd
commit ea99915af6
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/allmydata/test/test_connections.py
View File

@ -31,7 +31,7 @@ class TCP(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
_, foolscap_handlers = create_connection_handlers(None, 'basedir', config, mock.Mock(), mock.Mock()) _, foolscap_handlers = create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertIsInstance( self.assertIsInstance(
foolscap_handlers['tcp'], foolscap_handlers['tcp'],
tcp.DefaultTCP, tcp.DefaultTCP,
@ -46,7 +46,7 @@ class Tor(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertEqual(h, None) self.assertEqual(h, None)
@ -54,7 +54,7 @@ class Tor(unittest.TestCase):
with mock.patch("allmydata.util.tor_provider._import_tor", with mock.patch("allmydata.util.tor_provider._import_tor",
return_value=None): return_value=None):
config = config_from_string(BASECONFIG, "fake.port", "no-basedir") config = config_from_string(BASECONFIG, "fake.port", "no-basedir")
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertEqual(h, None) self.assertEqual(h, None)
@ -64,7 +64,7 @@ class Tor(unittest.TestCase):
return_value=h1) as f: return_value=h1) as f:
config = config_from_string(BASECONFIG, "fake.port", "no-basedir") config = config_from_string(BASECONFIG, "fake.port", "no-basedir")
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertEqual(f.mock_calls, [mock.call()]) self.assertEqual(f.mock_calls, [mock.call()])
self.assertIdentical(h, h1) self.assertIdentical(h, h1)
@ -78,8 +78,8 @@ class Tor(unittest.TestCase):
with mock.patch("foolscap.connections.tor.control_endpoint_maker", with mock.patch("foolscap.connections.tor.control_endpoint_maker",
return_value=h1) as f: return_value=h1) as f:
config = config_from_string(config, "fake.port", "no-basedir") config = config_from_string(config, "fake.port", ".")
tp = create_tor_provider("reactor", 'BASEDIR', config) tp = create_tor_provider("reactor", config)
h = tp.get_tor_handler() h = tp.get_tor_handler()
private_dir = config.get_config_path("private") private_dir = config.get_config_path("private")
@ -120,7 +120,7 @@ class Tor(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0])) self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0]))
self.assertIdentical(h, h1) self.assertIdentical(h, h1)
@ -134,7 +134,7 @@ class Tor(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0])) self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0]))
self.assertIdentical(h, h1) self.assertIdentical(h, h1)
@ -148,7 +148,7 @@ class Tor(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0])) self.assertTrue(IStreamClientEndpoint.providedBy(f.mock_calls[0]))
self.assertIdentical(h, h1) self.assertIdentical(h, h1)
@ -160,7 +160,7 @@ class Tor(unittest.TestCase):
"no-basedir", "no-basedir",
) )
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
tor_provider.get_tor_handler() tor_provider.get_tor_handler()
self.assertIn( self.assertIn(
"Unknown endpoint type: 'meow'", "Unknown endpoint type: 'meow'",
@ -174,7 +174,7 @@ class Tor(unittest.TestCase):
"no-basedir", "no-basedir",
) )
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
tor_provider.get_tor_handler() tor_provider.get_tor_handler()
self.assertIn( self.assertIn(
"invalid literal for int() with base 10: 'kumquat'", "invalid literal for int() with base 10: 'kumquat'",
@ -190,7 +190,7 @@ class Tor(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
tor_provider = create_tor_provider(reactor, 'BASEDIR', config) tor_provider = create_tor_provider(reactor, config)
h = tor_provider.get_tor_handler() h = tor_provider.get_tor_handler()
self.assertEqual(len(f.mock_calls), 1) self.assertEqual(len(f.mock_calls), 1)
ep = f.mock_calls[0][1][0] ep = f.mock_calls[0][1][0]
@ -205,7 +205,7 @@ class I2P(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
i2p_provider = create_i2p_provider(None, 'BASEDIR', config) i2p_provider = create_i2p_provider(None, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
self.assertEqual(h, None) self.assertEqual(h, None)
@ -217,7 +217,7 @@ class I2P(unittest.TestCase):
) )
with mock.patch("allmydata.util.i2p_provider._import_i2p", with mock.patch("allmydata.util.i2p_provider._import_i2p",
return_value=None): return_value=None):
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
self.assertEqual(h, None) self.assertEqual(h, None)
@ -226,7 +226,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.default", with mock.patch("foolscap.connections.i2p.default",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
self.assertEqual(f.mock_calls, [mock.call(reactor, keyfile=None)]) self.assertEqual(f.mock_calls, [mock.call(reactor, keyfile=None)])
self.assertIdentical(h, h1) self.assertIdentical(h, h1)
@ -240,7 +240,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.sam_endpoint", with mock.patch("foolscap.connections.i2p.sam_endpoint",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
self.assertEqual(len(f.mock_calls), 1) self.assertEqual(len(f.mock_calls), 1)
@ -256,7 +256,7 @@ class I2P(unittest.TestCase):
"no-basedir", "no-basedir",
) )
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
i2p_provider.get_i2p_handler() i2p_provider.get_i2p_handler()
self.assertIn( self.assertIn(
"must not set both sam.port and launch", "must not set both sam.port and launch",
@ -272,7 +272,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.launch", with mock.patch("foolscap.connections.i2p.launch",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
exp = mock.call(i2p_configdir=None, i2p_binary=None) exp = mock.call(i2p_configdir=None, i2p_binary=None)
self.assertEqual(f.mock_calls, [exp]) self.assertEqual(f.mock_calls, [exp])
@ -287,7 +287,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.launch", with mock.patch("foolscap.connections.i2p.launch",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
exp = mock.call(i2p_configdir=None, i2p_binary="i2p") exp = mock.call(i2p_configdir=None, i2p_binary="i2p")
self.assertEqual(f.mock_calls, [exp]) self.assertEqual(f.mock_calls, [exp])
@ -302,7 +302,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.launch", with mock.patch("foolscap.connections.i2p.launch",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
exp = mock.call(i2p_configdir="cfg", i2p_binary=None) exp = mock.call(i2p_configdir="cfg", i2p_binary=None)
self.assertEqual(f.mock_calls, [exp]) self.assertEqual(f.mock_calls, [exp])
@ -318,7 +318,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.launch", with mock.patch("foolscap.connections.i2p.launch",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(reactor, 'BASEDIR', config) i2p_provider = create_i2p_provider(reactor, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
exp = mock.call(i2p_configdir="cfg", i2p_binary="i2p") exp = mock.call(i2p_configdir="cfg", i2p_binary="i2p")
self.assertEqual(f.mock_calls, [exp]) self.assertEqual(f.mock_calls, [exp])
@ -333,7 +333,7 @@ class I2P(unittest.TestCase):
h1 = mock.Mock() h1 = mock.Mock()
with mock.patch("foolscap.connections.i2p.local_i2p", with mock.patch("foolscap.connections.i2p.local_i2p",
return_value=h1) as f: return_value=h1) as f:
i2p_provider = create_i2p_provider(None, 'BASEDIR', config) i2p_provider = create_i2p_provider(None, config)
h = i2p_provider.get_i2p_handler() h = i2p_provider.get_i2p_handler()
self.assertEqual(f.mock_calls, [mock.call("cfg")]) self.assertEqual(f.mock_calls, [mock.call("cfg")])
@ -346,7 +346,7 @@ class Connections(unittest.TestCase):
self.config = config_from_string(BASECONFIG, "fake.port", self.basedir) self.config = config_from_string(BASECONFIG, "fake.port", self.basedir)
def test_default(self): def test_default(self):
default_connection_handlers, _ = create_connection_handlers(None, self.basedir, self.config, mock.Mock(), mock.Mock()) default_connection_handlers, _ = create_connection_handlers(None, self.config, mock.Mock(), mock.Mock())
self.assertEqual(default_connection_handlers["tcp"], "tcp") self.assertEqual(default_connection_handlers["tcp"], "tcp")
self.assertEqual(default_connection_handlers["tor"], "tor") self.assertEqual(default_connection_handlers["tor"], "tor")
self.assertEqual(default_connection_handlers["i2p"], "i2p") self.assertEqual(default_connection_handlers["i2p"], "i2p")
@ -357,7 +357,7 @@ class Connections(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
default_connection_handlers, _ = create_connection_handlers(None, self.basedir, config, mock.Mock(), mock.Mock()) default_connection_handlers, _ = create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertEqual(default_connection_handlers["tcp"], "tor") self.assertEqual(default_connection_handlers["tcp"], "tor")
self.assertEqual(default_connection_handlers["tor"], "tor") self.assertEqual(default_connection_handlers["tor"], "tor")
@ -372,8 +372,8 @@ class Connections(unittest.TestCase):
"no-basedir", "no-basedir",
) )
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
tor_provider = create_tor_provider(reactor, 'BASEDIR', self.config) tor_provider = create_tor_provider(reactor, self.config)
default_connection_handlers, _ = create_connection_handlers(None, self.basedir, self.config, mock.Mock(), tor_provider) default_connection_handlers, _ = create_connection_handlers(None, self.config, mock.Mock(), tor_provider)
self.assertEqual( self.assertEqual(
str(ctx.exception), str(ctx.exception),
"'tahoe.cfg [connections] tcp='" "'tahoe.cfg [connections] tcp='"
@ -388,7 +388,7 @@ class Connections(unittest.TestCase):
"no-basedir", "no-basedir",
) )
with self.assertRaises(ValueError) as ctx: with self.assertRaises(ValueError) as ctx:
create_connection_handlers(None, self.basedir, config, mock.Mock(), mock.Mock()) create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertIn("'tahoe.cfg [connections] tcp='", str(ctx.exception)) self.assertIn("'tahoe.cfg [connections] tcp='", str(ctx.exception))
self.assertIn("uses unknown handler type 'unknown'", str(ctx.exception)) self.assertIn("uses unknown handler type 'unknown'", str(ctx.exception))
@ -398,7 +398,7 @@ class Connections(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
default_connection_handlers, _ = create_connection_handlers(None, self.basedir, config, mock.Mock(), mock.Mock()) default_connection_handlers, _ = create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertEqual(default_connection_handlers["tcp"], None) self.assertEqual(default_connection_handlers["tcp"], None)
self.assertEqual(default_connection_handlers["tor"], "tor") self.assertEqual(default_connection_handlers["tor"], "tor")
self.assertEqual(default_connection_handlers["i2p"], "i2p") self.assertEqual(default_connection_handlers["i2p"], "i2p")
@ -413,7 +413,7 @@ class Privacy(unittest.TestCase):
) )
with self.assertRaises(PrivacyError) as ctx: with self.assertRaises(PrivacyError) as ctx:
create_connection_handlers(None, 'BASEDIR', config, mock.Mock(), mock.Mock()) create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertEqual( self.assertEqual(
str(ctx.exception), str(ctx.exception),
@ -427,7 +427,7 @@ class Privacy(unittest.TestCase):
"fake.port", "fake.port",
"no-basedir", "no-basedir",
) )
default_connection_handlers, _ = create_connection_handlers(None, 'BASEDIR', config, mock.Mock(), mock.Mock()) default_connection_handlers, _ = create_connection_handlers(None, config, mock.Mock(), mock.Mock())
self.assertEqual(default_connection_handlers["tcp"], None) self.assertEqual(default_connection_handlers["tcp"], None)
def test_tub_location_auto(self): def test_tub_location_auto(self):
@ -438,7 +438,7 @@ class Privacy(unittest.TestCase):
) )
with self.assertRaises(PrivacyError) as ctx: with self.assertRaises(PrivacyError) as ctx:
create_main_tub('basedir', config, {}, {}, {}, mock.Mock(), mock.Mock()) create_main_tub(config, {}, {}, {}, mock.Mock(), mock.Mock())
self.assertEqual( self.assertEqual(
str(ctx.exception), str(ctx.exception),
"tub.location uses AUTO", "tub.location uses AUTO",

8
src/allmydata/test/test_node.py
View File

@ -673,12 +673,12 @@ class Listeners(unittest.TestCase):
i2p_provider = mock.Mock() i2p_provider = mock.Mock()
tor_provider = mock.Mock() tor_provider = mock.Mock()
dfh, fch = create_connection_handlers(None, basedir, config, i2p_provider, tor_provider) dfh, fch = create_connection_handlers(None, config, i2p_provider, tor_provider)
tub_options = create_tub_options(config) tub_options = create_tub_options(config)
t = FakeTub() t = FakeTub()
with mock.patch("allmydata.node.Tub", return_value=t): with mock.patch("allmydata.node.Tub", return_value=t):
create_main_tub(basedir, config, tub_options, dfh, fch, i2p_provider, tor_provider) create_main_tub(config, tub_options, dfh, fch, i2p_provider, tor_provider)
self.assertEqual(t.listening_ports, self.assertEqual(t.listening_ports,
["tcp:%d:interface=127.0.0.1" % port1, ["tcp:%d:interface=127.0.0.1" % port1,
"tcp:%d:interface=127.0.0.1" % port2]) "tcp:%d:interface=127.0.0.1" % port2])
@ -713,10 +713,10 @@ class Listeners(unittest.TestCase):
tub_options = create_tub_options(config) tub_options = create_tub_options(config)
t = FakeTub() t = FakeTub()
dfh, fch = create_connection_handlers(None, basedir, config, i2p_provider, tor_provider) dfh, fch = create_connection_handlers(None, config, i2p_provider, tor_provider)
with mock.patch("allmydata.node.Tub", return_value=t): with mock.patch("allmydata.node.Tub", return_value=t):
create_main_tub(basedir, config, tub_options, dfh, fch, i2p_provider, tor_provider) create_main_tub(config, tub_options, dfh, fch, i2p_provider, tor_provider)
self.assertEqual(i2p_provider.get_listener.mock_calls, [mock.call()]) self.assertEqual(i2p_provider.get_listener.mock_calls, [mock.call()])
self.assertEqual(tor_provider.get_listener.mock_calls, [mock.call()]) self.assertEqual(tor_provider.get_listener.mock_calls, [mock.call()])