[py-svn] r45670 - in py/branch/session-cleanups/py/test: . testing

[fijal at codespeak.net]

Author: fijal
Date: Wed Aug 15 12:51:34 2007
New Revision: 45670

Modified:
   py/branch/session-cleanups/py/test/collect.py
   py/branch/session-cleanups/py/test/testing/test_collect.py
Log:
Kill _tryiter arguments! Hooray!


Modified: py/branch/session-cleanups/py/test/collect.py
==============================================================================
--- py/branch/session-cleanups/py/test/collect.py	(original)
+++ py/branch/session-cleanups/py/test/collect.py	Wed Aug 15 12:51:34 2007
@@ -189,7 +189,7 @@
                 return True 
         return False
 
-    def _tryiter(self, yieldtype=None, reporterror=None, keyword=None):
+    def _tryiter(self, yieldtype=None):
         """ yield stop item instances from flattening the collector. 
             XXX deprecated: this way of iteration is not safe in all
             cases. 
@@ -197,28 +197,17 @@
         if yieldtype is None: 
             yieldtype = py.test.collect.Item 
         if isinstance(self, yieldtype):
-            try:
-                self._skipbykeyword(keyword)
-                yield self
-            except Skipped:
-                if reporterror is not None:
-                    excinfo = py.code.ExceptionInfo()
-                    reporterror((excinfo, self))
+            yield self
         else:
             if not isinstance(self, py.test.collect.Item):
                 try:
-                    if reporterror is not None:
-                        reporterror((None, self))
                     for x in self.run(): 
-                        for y in self.join(x)._tryiter(yieldtype, 
-                                            reporterror, keyword): 
+                        for y in self.join(x)._tryiter(yieldtype):
                             yield y
                 except KeyboardInterrupt:
                     raise
-                except: 
-                    if reporterror is not None: 
-                        excinfo = py.code.ExceptionInfo()
-                        reporterror((excinfo, self)) 
+                except:
+                    pass
 
     def _getsortvalue(self): 
         return self.name 

Modified: py/branch/session-cleanups/py/test/testing/test_collect.py
==============================================================================
--- py/branch/session-cleanups/py/test/testing/test_collect.py	(original)
+++ py/branch/session-cleanups/py/test/testing/test_collect.py	Wed Aug 15 12:51:34 2007
@@ -371,10 +371,6 @@
         py.test.fail("should not have raised: %s"  %(exc,))
 
     l = []
-    list(col._tryiter(reporterror=l.append))
-    assert len(l) == 2
-    excinfo, item = l[-1]
-    assert isinstance(excinfo, py.code.ExceptionInfo)
 
 def test_tryiter_handles_keyboardinterrupt(): 
     tmp = py.test.ensuretemp("tryiterkeyboard")
@@ -412,9 +408,7 @@
     """))
     tmp.ensure("__init__.py")
     col = py.test.collect.Module(tmp.join("test_one.py"))
-    errors = []
-    l = list(col._tryiter(reporterror=errors.append))
-    assert len(errors) == 2
+    assert len(col.join('test_one').run()) == 3
 
 def test_generator_setup_invoked_twice():
     py.test.skip("Test for generators not invoking setup, needs thinking")