ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-24 21:09:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt test_tor to write_introducer change

Browse Source
This commit is contained in:
Jean-Paul Calderone 2020-11-26 21:46:57 -05:00
parent 84088e4f41
commit ae5351c204
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
integration/test_tor.py
View File

@ -9,6 +9,10 @@ import pytest_twisted
import util import util
from twisted.python.filepath import (
FilePath,
)
from allmydata.test.common import ( from allmydata.test.common import (
write_introducer, write_introducer,
) )
@ -70,12 +74,12 @@ def test_onion_service_storage(reactor, request, temp_dir, flog_gatherer, tor_ne
@pytest_twisted.inlineCallbacks @pytest_twisted.inlineCallbacks
def _create_anonymous_node(reactor, name, control_port, request, temp_dir, flog_gatherer, tor_network, introducer_furl): def _create_anonymous_node(reactor, name, control_port, request, temp_dir, flog_gatherer, tor_network, introducer_furl):
node_dir = join(temp_dir, name) node_dir = FilePath(temp_dir).child(name)
web_port = "tcp:{}:interface=localhost".format(control_port + 2000) web_port = "tcp:{}:interface=localhost".format(control_port + 2000)
if True: if True:
print("creating", node_dir) print("creating", node_dir.path)
mkdir(node_dir) node_dir.makedirs()
proto = util._DumpOutputProtocol(None) proto = util._DumpOutputProtocol(None)
reactor.spawnProcess( reactor.spawnProcess(
proto, proto,
@ -88,7 +92,7 @@ def _create_anonymous_node(reactor, name, control_port, request, temp_dir, flog_
'--hide-ip', '--hide-ip',
'--tor-control-port', 'tcp:localhost:{}'.format(control_port), '--tor-control-port', 'tcp:localhost:{}'.format(control_port),
'--listen', 'tor', '--listen', 'tor',
node_dir, node_dir.path,
) )
) )
yield proto.done yield proto.done
@ -96,7 +100,7 @@ def _create_anonymous_node(reactor, name, control_port, request, temp_dir, flog_
# Which services should this client connect to? # Which services should this client connect to?
write_introducer(node_dir, "default", introducer_furl) write_introducer(node_dir, "default", introducer_furl)
with open(join(node_dir, 'tahoe.cfg'), 'w') as f: with node_dir.child('tahoe.cfg').open('w') as f:
f.write(''' f.write('''
[node] [node]
nickname = %(name)s nickname = %(name)s
@ -125,5 +129,5 @@ shares.total = 2
}) })
print("running") print("running")
yield util._run_node(reactor, node_dir, request, None) yield util._run_node(reactor, node_dir.path, request, None)
print("okay, launched") print("okay, launched")