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

test/check_memory: stop using .tac files

Browse Source
This commit is contained in:
Brian Warner 2016-03-25 16:26:29 -07:00
parent c545d5c0a1
commit 017fec16a4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/test/check_memory.py
View File

@ -10,7 +10,7 @@ from allmydata.util import fileutil, pollmixin
from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.fileutil import abspath_expanduser_unicode
from allmydata.util.encodingutil import get_filesystem_encoding from allmydata.util.encodingutil import get_filesystem_encoding
from foolscap.api import Tub, fireEventually, flushEventualQueue from foolscap.api import Tub, fireEventually, flushEventualQueue
from twisted.python import log from twisted.python import log, procutils
class StallableHTTPGetterDiscarder(tw_client.HTTPPageGetter): class StallableHTTPGetterDiscarder(tw_client.HTTPPageGetter):
full_speed_ahead = False full_speed_ahead = False
@ -268,7 +268,10 @@ this file are ignored.
pp = ClientWatcher() pp = ClientWatcher()
self.proc_done = pp.d = defer.Deferred() self.proc_done = pp.d = defer.Deferred()
logfile = os.path.join(self.basedir, "client.log") logfile = os.path.join(self.basedir, "client.log")
cmd = ["twistd", "-n", "-y", "tahoe-client.tac", "-l", logfile] tahoes = procutils.which("tahoe")
if not tahoes:
raise RuntimeError("unable to find a 'tahoe' executable")
cmd = [tahoes[0], "run", ".", "-l", logfile]
env = os.environ.copy() env = os.environ.copy()
self.proc = reactor.spawnProcess(pp, cmd[0], cmd, env, path=clientdir_str) self.proc = reactor.spawnProcess(pp, cmd[0], cmd, env, path=clientdir_str)
log.msg("CLIENT STARTED") log.msg("CLIENT STARTED")