[py-svn] r37884 - in py/trunk/py/test: . rsession

[fijal at codespeak.net]

Author: fijal
Date: Sat Feb  3 21:15:55 2007
New Revision: 37884

Modified:
   py/trunk/py/test/collect.py
   py/trunk/py/test/rsession/slave.py
Log:
Few missing Skipped


Modified: py/trunk/py/test/collect.py
==============================================================================
--- py/trunk/py/test/collect.py	(original)
+++ py/trunk/py/test/collect.py	Sat Feb  3 21:15:55 2007
@@ -25,6 +25,7 @@
 """ 
 from __future__ import generators 
 import py
+from py.__.test.outcome import Skipped, Failed, Passed
 
 def configproperty(name):
     def fget(self):
@@ -203,7 +204,7 @@
             try:
                 self._skipbykeyword(keyword)
                 yield self
-            except py.test.Item.Skipped:
+            except Skipped:
                 if reporterror is not None:
                     excinfo = py.code.ExceptionInfo()
                     reporterror((excinfo, self))

Modified: py/trunk/py/test/rsession/slave.py
==============================================================================
--- py/trunk/py/test/rsession/slave.py	(original)
+++ py/trunk/py/test/rsession/slave.py	Sat Feb  3 21:15:55 2007
@@ -5,6 +5,7 @@
 import py
 from py.__.test.rsession.executor import RunExecutor, BoxExecutor, AsyncExecutor
 from py.__.test.rsession.outcome import Outcome
+from py.__.test.outcome import Skipped
 import thread
 import os
 
@@ -90,7 +91,7 @@
         try:
             node = getnode(nextitem)
             res = node.run(nextitem)
-        except py.test.Item.Skipped, s:
+        except Skipped, s:
             send(Outcome(skipped=str(s)).make_repr())
         except:
             excinfo = py.code.ExceptionInfo()