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

[svn r38099] * RSession cannot work with nocapture, LSession can 

* RSession is always boxed

--HG--
branch : trunk
This commit is contained in:
fijal 2007-02-07 19:54:51 +01:00
parent ecd605e3b2
commit ee1214fcfe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
py/test/rsession/rsession.py
View File

@ -27,9 +27,6 @@ class AbstractSession(Session):
if option.runbrowser and not option.startserver: if option.runbrowser and not option.startserver:
#print "--runbrowser implies --startserver" #print "--runbrowser implies --startserver"
option.startserver = True option.startserver = True
if option.nocapture:
print "Cannot use nocapture with distributed testing"
sys.exit(1)
if self.config.getvalue("dist_boxed"): if self.config.getvalue("dist_boxed"):
option.boxed = True option.boxed = True
super(AbstractSession, self).fixoptions() super(AbstractSession, self).fixoptions()
@ -111,7 +108,12 @@ class RSession(AbstractSession):
""" """
def fixoptions(self): def fixoptions(self):
super(RSession, self).fixoptions() super(RSession, self).fixoptions()
option = self.config.option
if option.nocapture:
print "Cannot use nocapture with distributed testing"
sys.exit(1)
config = self.config config = self.config
config.option.boxed = True
try: try:
config.getvalue('dist_hosts') config.getvalue('dist_hosts')
except KeyError: except KeyError: