p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37884] Few missing Skipped 

--HG--
branch : trunk
This commit is contained in:
fijal 2007-02-03 21:15:55 +01:00
parent f5308aba2d
commit 309f3e2cec
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/test/collect.py
View File

@ -25,6 +25,7 @@ The is a schematic example of a tree of collectors and test items::
""" """
from __future__ import generators from __future__ import generators
import py import py
from py.__.test.outcome import Skipped, Failed, Passed
def configproperty(name): def configproperty(name):
def fget(self): def fget(self):
@ -203,7 +204,7 @@ class Collector(object):
try: try:
self._skipbykeyword(keyword) self._skipbykeyword(keyword)
yield self yield self
except py.test.Item.Skipped: except Skipped:
if reporterror is not None: if reporterror is not None:
excinfo = py.code.ExceptionInfo() excinfo = py.code.ExceptionInfo()
reporterror((excinfo, self)) reporterror((excinfo, self))

3
py/test/rsession/slave.py
View File

@ -5,6 +5,7 @@ Node code for slaves.
import py import py
from py.__.test.rsession.executor import RunExecutor, BoxExecutor, AsyncExecutor from py.__.test.rsession.executor import RunExecutor, BoxExecutor, AsyncExecutor
from py.__.test.rsession.outcome import Outcome from py.__.test.rsession.outcome import Outcome
from py.__.test.outcome import Skipped
import thread import thread
import os import os
@ -90,7 +91,7 @@ def slave_main(receive, send, path, config, pidinfo):
try: try:
node = getnode(nextitem) node = getnode(nextitem)
res = node.run(nextitem) res = node.run(nextitem)
except py.test.Item.Skipped, s: except Skipped, s:
send(Outcome(skipped=str(s)).make_repr()) send(Outcome(skipped=str(s)).make_repr())
except: except:
excinfo = py.code.ExceptionInfo() excinfo = py.code.ExceptionInfo()