[py-svn] r35746 - in py/dist/py/test/rsession: . testing
fijal at codespeak.net
fijal at codespeak.net
Thu Dec 14 16:29:12 CET 2006
Author: fijal
Date: Thu Dec 14 16:29:10 2006
New Revision: 35746
Modified:
py/dist/py/test/rsession/reporter.py
py/dist/py/test/rsession/rest.py
py/dist/py/test/rsession/rsession.py
py/dist/py/test/rsession/testing/test_boxing.py
Log:
Fixed script return value.
Modified: py/dist/py/test/rsession/reporter.py
==============================================================================
--- py/dist/py/test/rsession/reporter.py (original)
+++ py/dist/py/test/rsession/reporter.py Thu Dec 14 16:29:10 2006
@@ -41,7 +41,7 @@
repfun = getattr(self, "report_" + what.__class__.__name__,
self.report_unknown)
try:
- repfun(what)
+ return repfun(what)
except (KeyboardInterrupt, SystemExit):
raise
except:
@@ -88,6 +88,7 @@
if hasattr(self, 'nodes'): # XXX: Testing
self.hangs()
self.summary()
+ return len(self.failed_tests_outcome) > 0
def hangs(self):
h = []
Modified: py/dist/py/test/rsession/rest.py
==============================================================================
--- py/dist/py/test/rsession/rest.py (original)
+++ py/dist/py/test/rsession/rest.py Thu Dec 14 16:29:10 2006
@@ -47,6 +47,7 @@
def report_TestFinished(self, item):
self.timeend = item.timeend
self.summary()
+ return len(self.failed_tests_outcome) > 0
def report_ImmediateFailure(self, item):
pass
Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py (original)
+++ py/dist/py/test/rsession/rsession.py Thu Dec 14 16:29:10 2006
@@ -207,10 +207,11 @@
teardown_hosts(reporter, [node.channel for node in nodes], nodes,
exitfirst=self.config.option.exitfirst)
reporter(report.Nodes(nodes))
- reporter(report.TestFinished())
+ retval = reporter(report.TestFinished())
if startserverflag:
from py.__.test.rsession.web import kill_server
kill_server()
+ return retval
class LSession(AbstractSession):
""" Local version of session
@@ -269,7 +270,7 @@
# XXX: We have to decide which runner to use at this point
local_loop(self, reporter, itemgenerator, checkfun, self.config, runner=runner)
- reporter(report.TestFinished())
+ retval = reporter(report.TestFinished())
if startserverflag:
from py.__.test.rsession.web import kill_server
kill_server()
@@ -286,3 +287,4 @@
"provided way of doing that in conftest")
else:
apigen.write_docs(self.docstorage)
+ return retval
Modified: py/dist/py/test/rsession/testing/test_boxing.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_boxing.py (original)
+++ py/dist/py/test/rsession/testing/test_boxing.py Thu Dec 14 16:29:10 2006
@@ -89,3 +89,4 @@
os.kill(pid, 15)
par(pid)
assert b.signal == 15
+
More information about the py-svn
mailing list