tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

use full paths for everything

This commit is contained in:
meejah 2016-09-15 10:48:16 -06:00 committed by Brian Warner
parent b2628b0826
commit 2497435c1a
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
integration/conftest.py
View File

@ -233,7 +233,13 @@ log_gatherer.furl = {log_furl}
reactor.spawnProcess( reactor.spawnProcess(
done_proto, done_proto,
sys.executable, sys.executable,
('python', '-m', 'allmydata.scripts.runner', 'create-introducer', '--listen=tcp', '--hostname=localhost', intro_dir), (
sys.executable, '-m', 'allmydata.scripts.runner',
'create-introducer',
'--listen=tcp',
'--hostname=localhost',
intro_dir,
),
) )
pytest.blockon(done_proto.done) pytest.blockon(done_proto.done)
@ -248,7 +254,11 @@ log_gatherer.furl = {log_furl}
process = reactor.spawnProcess( process = reactor.spawnProcess(
protocol, protocol,
sys.executable, sys.executable,
('python', '-m', 'allmydata.scripts.runner', 'run', intro_dir), (
sys.executable, '-m', 'allmydata.scripts.runner',
'run',
intro_dir,
),
) )
def cleanup(): def cleanup():
@ -284,7 +294,11 @@ def _run_node(reactor, node_dir, request, magic_text):
process = reactor.spawnProcess( process = reactor.spawnProcess(
protocol, protocol,
sys.executable, sys.executable,
('python', '-m', 'allmydata.scripts.runner', 'run', node_dir), (
sys.executable, '-m', 'allmydata.scripts.runner',
'run',
node_dir,
),
) )
process.exited = protocol.exited process.exited = protocol.exited
@ -315,7 +329,7 @@ def _create_node(reactor, request, temp_dir, introducer_furl, flog_gatherer, nam
mkdir(node_dir) mkdir(node_dir)
done_proto = _ProcessExitedProtocol() done_proto = _ProcessExitedProtocol()
args = [ args = [
'python', '-m', 'allmydata.scripts.runner', sys.executable, '-m', 'allmydata.scripts.runner',
'create-node', 'create-node',
'--nickname', name, '--nickname', name,
'--introducer', introducer_furl, '--introducer', introducer_furl,
@ -424,7 +438,7 @@ def alice_invite(reactor, alice, temp_dir, request):
proto, proto,
sys.executable, sys.executable,
[ [
'python', '-m', 'allmydata.scripts.runner', sys.executable, '-m', 'allmydata.scripts.runner',
'magic-folder', 'create', 'magic-folder', 'create',
'--basedir', node_dir, 'magik:', 'alice', '--basedir', node_dir, 'magik:', 'alice',
join(temp_dir, 'magic-alice'), join(temp_dir, 'magic-alice'),
@ -437,7 +451,7 @@ def alice_invite(reactor, alice, temp_dir, request):
proto, proto,
sys.executable, sys.executable,
[ [
'python', '-m', 'allmydata.scripts.runner', sys.executable, '-m', 'allmydata.scripts.runner',
'magic-folder', 'invite', 'magic-folder', 'invite',
'--basedir', node_dir, 'magik:', 'bob', '--basedir', node_dir, 'magik:', 'bob',
] ]
@ -467,7 +481,7 @@ def magic_folder(reactor, alice_invite, alice, bob, temp_dir, request):
proto, proto,
sys.executable, sys.executable,
[ [
'python', '-m', 'allmydata.scripts.runner', sys.executable, '-m', 'allmydata.scripts.runner',
'magic-folder', 'join', 'magic-folder', 'join',
'--basedir', bob_dir, '--basedir', bob_dir,
alice_invite, alice_invite,