floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37936] minor cleanups 

--HG--
branch : trunk
This commit is contained in:
hpk 2007-02-05 00:21:35 +01:00
parent e8bdb867fa
commit fb2613135b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/test/rsession/hostmanage.py
View File

@ -105,10 +105,10 @@ class HostManager(object):
dist_remotepython = self.config.getvalue("dist_remotepython") dist_remotepython = self.config.getvalue("dist_remotepython")
for host in self.sshhosts: for host in self.sshhosts:
host.initgateway(python=dist_remotepython) host.initgateway(python=dist_remotepython)
host.gw.host = host # XXX would like to avoid it host.gw.host = host
def init_rsync(self, reporter): def init_rsync(self, reporter):
# send each rsync roots # send each rsync root
roots = self.config.getvalue_pathlist("dist_rsync_roots") roots = self.config.getvalue_pathlist("dist_rsync_roots")
if roots is None: if roots is None:
roots = [self.config.topdir] roots = [self.config.topdir]

4
py/test/rsession/master.py
View File

@ -33,8 +33,10 @@ class MasterNode(object):
self.reporter(report.SendItem(self.channel, item)) self.reporter(report.SendItem(self.channel, item))
def itemgen(colitems, reporter, keyword, reporterror): def itemgen(colitems, reporter, keyword, reporterror):
def rep(x):
reporterror(reporter, x)
for x in colitems: for x in colitems:
for y in x._tryiter(reporterror = lambda x: reporterror(reporter, x), keyword = keyword): for y in x._tryiter(reporterror=rep, keyword=keyword):
yield y yield y
def dispatch_loop(masternodes, itemgenerator, shouldstop, def dispatch_loop(masternodes, itemgenerator, shouldstop,

14
py/test/rsession/rsession.py
View File

@ -68,13 +68,13 @@ class AbstractSession(Session):
return reporter, startserverflag return reporter, startserverflag
def reporterror(reporter, data): def reporterror(reporter, data):
excinfo, item = data excinfo, item = data
if excinfo is None: if excinfo is None:
reporter(report.ItemStart(item)) reporter(report.ItemStart(item))
elif excinfo.type is Skipped: elif excinfo.type is Skipped:
reporter(report.SkippedTryiter(excinfo, item)) reporter(report.SkippedTryiter(excinfo, item))
else: else:
reporter(report.FailedTryiter(excinfo, item)) reporter(report.FailedTryiter(excinfo, item))
reporterror = staticmethod(reporterror) reporterror = staticmethod(reporterror)
def kill_server(self, startserverflag): def kill_server(self, startserverflag):