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

Use "python -m allmydata.scripts.runner" instead of tahoe.exe

Browse Source 
On windows, it seems that the generated tahoe.exe (which comes
via entry_points=) doesn't deal with signals nicely. I'm not
sure if this is a pip bug (or just "one of those Windows things")
but running with python -m allows us to kill our subprocesses.
This commit is contained in:
meejah 2016-09-12 22:30:55 -06:00 committed by Brian Warner
parent a93e8d7bd0
commit a0fc80d544
1 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
integration/conftest.py
View File

@ -65,14 +65,6 @@ def temp_dir(request):
return tmp return tmp
@pytest.fixture(scope='session')
def tahoe_binary():
"""
Finds the 'tahoe' binary, yields complete path
"""
return which('tahoe')
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def flog_binary(): def flog_binary():
return which('flogtool') return which('flogtool')
@ -224,7 +216,7 @@ def flog_gatherer(reactor, temp_dir, flog_binary, request):
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def introducer(reactor, temp_dir, tahoe_binary, flog_gatherer, request): def introducer(reactor, temp_dir, flog_gatherer, request):
config = ''' config = '''
[node] [node]
nickname = introducer0 nickname = introducer0
@ -240,8 +232,8 @@ log_gatherer.furl = {log_furl}
done_proto = _ProcessExitedProtocol() done_proto = _ProcessExitedProtocol()
reactor.spawnProcess( reactor.spawnProcess(
done_proto, done_proto,
tahoe_binary, sys.executable,
('tahoe', 'create-introducer', '--listen=tcp', '--hostname=localhost', intro_dir), ('python', '-m', 'allmydata.scripts.runner', 'create-introducer', '--listen=tcp', '--hostname=localhost', intro_dir),
) )
pytest.blockon(done_proto.done) pytest.blockon(done_proto.done)
@ -255,8 +247,8 @@ log_gatherer.furl = {log_furl}
protocol = _MagicTextProtocol('introducer running') protocol = _MagicTextProtocol('introducer running')
process = reactor.spawnProcess( process = reactor.spawnProcess(
protocol, protocol,
tahoe_binary, sys.executable,
('tahoe', 'run', intro_dir), ('python', '-m', 'allmydata.scripts.runner', 'run', intro_dir),
) )
def cleanup(): def cleanup():
@ -281,7 +273,7 @@ def introducer_furl(introducer, temp_dir):
return furl return furl
def _run_node(reactor, tahoe_binary, node_dir, request, magic_text): def _run_node(reactor, node_dir, request, magic_text):
if magic_text is None: if magic_text is None:
magic_text = "client running" magic_text = "client running"
protocol = _MagicTextProtocol(magic_text) protocol = _MagicTextProtocol(magic_text)
@ -291,9 +283,10 @@ def _run_node(reactor, tahoe_binary, node_dir, request, magic_text):
# between platforms. # between platforms.
process = reactor.spawnProcess( process = reactor.spawnProcess(
protocol, protocol,
tahoe_binary, sys.executable,
('tahoe', 'run', node_dir), ('python', '-m', 'allmydata.scripts.runner', 'run', node_dir),
) )
process.exited = protocol.exited
def cleanup(): def cleanup():
try: try:
@ -309,7 +302,7 @@ def _run_node(reactor, tahoe_binary, node_dir, request, magic_text):
return protocol.magic_seen return protocol.magic_seen
def _create_node(reactor, request, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, name, web_port, storage=True, magic_text=None): def _create_node(reactor, request, temp_dir, introducer_furl, flog_gatherer, name, web_port, storage=True, magic_text=None):
""" """
Helper to create a single node, run it and return the instance Helper to create a single node, run it and return the instance
spawnProcess returned (ITransport) spawnProcess returned (ITransport)
@ -322,7 +315,7 @@ def _create_node(reactor, request, temp_dir, tahoe_binary, introducer_furl, flog
mkdir(node_dir) mkdir(node_dir)
done_proto = _ProcessExitedProtocol() done_proto = _ProcessExitedProtocol()
args = [ args = [
'tahoe', 'python', '-m', 'allmydata.scripts.runner',
'create-node', 'create-node',
'--nickname', name, '--nickname', name,
'--introducer', introducer_furl, '--introducer', introducer_furl,
@ -335,7 +328,7 @@ def _create_node(reactor, request, temp_dir, tahoe_binary, introducer_furl, flog
reactor.spawnProcess( reactor.spawnProcess(
done_proto, done_proto,
tahoe_binary, sys.executable,
args, args,
) )
pytest.blockon(done_proto.done) pytest.blockon(done_proto.done)
@ -362,11 +355,11 @@ shares.total = 4
'log_furl': flog_gatherer, 'log_furl': flog_gatherer,
}) })
return _run_node(reactor, tahoe_binary, node_dir, request, magic_text) return _run_node(reactor, node_dir, request, magic_text)
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def storage_nodes(reactor, temp_dir, tahoe_binary, introducer, introducer_furl, flog_gatherer, request): def storage_nodes(reactor, temp_dir, introducer, introducer_furl, flog_gatherer, request):
nodes = [] nodes = []
# start all 5 nodes in parallel # start all 5 nodes in parallel
for x in range(5): for x in range(5):
@ -375,7 +368,7 @@ def storage_nodes(reactor, temp_dir, tahoe_binary, introducer, introducer_furl,
nodes.append( nodes.append(
pytest.blockon( pytest.blockon(
_create_node( _create_node(
reactor, request, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, name, reactor, request, temp_dir, introducer_furl, flog_gatherer, name,
web_port=None, storage=True, web_port=None, storage=True,
) )
) )
@ -385,7 +378,7 @@ def storage_nodes(reactor, temp_dir, tahoe_binary, introducer, introducer_furl,
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def alice(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, storage_nodes, request): def alice(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, request):
try: try:
mkdir(join(temp_dir, 'magic-alice')) mkdir(join(temp_dir, 'magic-alice'))
except OSError: except OSError:
@ -393,7 +386,7 @@ def alice(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, stora
process = pytest.blockon( process = pytest.blockon(
_create_node( _create_node(
reactor, request, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, "alice", reactor, request, temp_dir, introducer_furl, flog_gatherer, "alice",
web_port="tcp:9980:interface=localhost", web_port="tcp:9980:interface=localhost",
storage=False, storage=False,
) )
@ -402,7 +395,7 @@ def alice(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, stora
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def bob(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, storage_nodes, request): def bob(reactor, temp_dir, introducer_furl, flog_gatherer, storage_nodes, request):
try: try:
mkdir(join(temp_dir, 'magic-bob')) mkdir(join(temp_dir, 'magic-bob'))
except OSError: except OSError:
@ -410,7 +403,7 @@ def bob(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, storage
process = pytest.blockon( process = pytest.blockon(
_create_node( _create_node(
reactor, request, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, "bob", reactor, request, temp_dir, introducer_furl, flog_gatherer, "bob",
web_port="tcp:9981:interface=localhost", web_port="tcp:9981:interface=localhost",
storage=False, storage=False,
) )
@ -419,7 +412,7 @@ def bob(reactor, temp_dir, tahoe_binary, introducer_furl, flog_gatherer, storage
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def alice_invite(reactor, alice, tahoe_binary, temp_dir, request): def alice_invite(reactor, alice, temp_dir, request):
node_dir = join(temp_dir, 'alice') node_dir = join(temp_dir, 'alice')
# FIXME XXX by the time we see "client running" in the logs, the # FIXME XXX by the time we see "client running" in the logs, the
@ -429,9 +422,10 @@ def alice_invite(reactor, alice, tahoe_binary, temp_dir, request):
proto = _CollectOutputProtocol() proto = _CollectOutputProtocol()
transport = reactor.spawnProcess( transport = reactor.spawnProcess(
proto, proto,
tahoe_binary, sys.executable,
[ [
'tahoe', 'magic-folder', 'create', 'python', '-m', 'allmydata.scripts.runner',
'magic-folder', 'create',
'--basedir', node_dir, 'magik:', 'alice', '--basedir', node_dir, 'magik:', 'alice',
join(temp_dir, 'magic-alice'), join(temp_dir, 'magic-alice'),
] ]
@ -441,9 +435,10 @@ def alice_invite(reactor, alice, tahoe_binary, temp_dir, request):
proto = _CollectOutputProtocol() proto = _CollectOutputProtocol()
transport = reactor.spawnProcess( transport = reactor.spawnProcess(
proto, proto,
tahoe_binary, sys.executable,
[ [
'tahoe', 'magic-folder', 'invite', 'python', '-m', 'allmydata.scripts.runner',
'magic-folder', 'invite',
'--basedir', node_dir, 'magik:', 'bob', '--basedir', node_dir, 'magik:', 'bob',
] ]
) )
@ -453,31 +448,27 @@ def alice_invite(reactor, alice, tahoe_binary, temp_dir, request):
# before magic-folder works, we have to stop and restart (this is # before magic-folder works, we have to stop and restart (this is
# crappy for the tests -- can we fix it in magic-folder?) # crappy for the tests -- can we fix it in magic-folder?)
proto = _CollectOutputProtocol() try:
transport = reactor.spawnProcess( alice.signalProcess('TERM')
proto, pytest.blockon(alice.exited)
tahoe_binary, except ProcessExitedAlready:
[ pass
'tahoe', 'stop', node_dir
]
)
pytest.blockon(proto.done)
magic_text = 'Completed initial Magic Folder scan successfully' magic_text = 'Completed initial Magic Folder scan successfully'
pytest.blockon(_run_node(reactor, tahoe_binary, node_dir, request, magic_text)) pytest.blockon(_run_node(reactor, node_dir, request, magic_text))
return invite return invite
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def magic_folder(reactor, alice_invite, alice, bob, tahoe_binary, temp_dir, request): def magic_folder(reactor, alice_invite, alice, bob, temp_dir, request):
print("pairing magic-folder") print("pairing magic-folder")
bob_dir = join(temp_dir, 'bob') bob_dir = join(temp_dir, 'bob')
proto = _CollectOutputProtocol() proto = _CollectOutputProtocol()
transport = reactor.spawnProcess( transport = reactor.spawnProcess(
proto, proto,
tahoe_binary, sys.executable,
[ [
'tahoe', 'magic-folder', 'join', 'python', '-m', 'allmydata.scripts.runner',
'magic-folder', 'join',
'--basedir', bob_dir, '--basedir', bob_dir,
alice_invite, alice_invite,
join(temp_dir, 'magic-bob'), join(temp_dir, 'magic-bob'),
@ -487,16 +478,13 @@ def magic_folder(reactor, alice_invite, alice, bob, tahoe_binary, temp_dir, requ
# before magic-folder works, we have to stop and restart (this is # before magic-folder works, we have to stop and restart (this is
# crappy for the tests -- can we fix it in magic-folder?) # crappy for the tests -- can we fix it in magic-folder?)
proto = _CollectOutputProtocol() try:
transport = reactor.spawnProcess( print("Sending TERM to Bob")
proto, bob.signalProcess('TERM')
tahoe_binary, pytest.blockon(bob.exited)
[ except ProcessExitedAlready:
'tahoe', 'stop', bob_dir pass
]
)
pytest.blockon(proto.done)
magic_text = 'Completed initial Magic Folder scan successfully' magic_text = 'Completed initial Magic Folder scan successfully'
pytest.blockon(_run_node(reactor, tahoe_binary, bob_dir, request, magic_text)) pytest.blockon(_run_node(reactor, bob_dir, request, magic_text))
return (join(temp_dir, 'magic-alice'), join(temp_dir, 'magic-bob')) return (join(temp_dir, 'magic-alice'), join(temp_dir, 'magic-bob'))