[py-svn] r51030 - in py/branch/reporter-merge/py/test: . terminal testing

[hpk at codespeak.net]

Author: hpk
Date: Fri Jan 25 14:30:54 2008
New Revision: 51030

Modified:
   py/branch/reporter-merge/py/test/session.py
   py/branch/reporter-merge/py/test/terminal/remote.py
   py/branch/reporter-merge/py/test/testing/test_remote.py
Log:
fixing test and restoring the functionality 
that session.main returns a list of failures 
(py.test --exec=python should work again) 



Modified: py/branch/reporter-merge/py/test/session.py
==============================================================================
--- py/branch/reporter-merge/py/test/session.py	(original)
+++ py/branch/reporter-merge/py/test/session.py	Fri Jan 25 14:30:54 2008
@@ -125,6 +125,7 @@
         keyword = self.config.option.keyword
         reporter = self.reporter
         itemgenerator = itemgen(self, colitems, reporter, keyword)
+        failures = []
         try:
             while 1:
                 try:
@@ -132,11 +133,15 @@
                     if shouldstop():
                         return
                     outcome = self.run(item)
+                    if outcome is not None: 
+                        if not outcome.passed and not outcome.skipped: 
+                            failures.append((item, outcome))
                     reporter(repevent.ReceivedItemOutcome(None, item, outcome))
                 except StopIteration:
                     break
         finally:
             self.footer(colitems)
+        return failures 
 
     def run(self, item):
         if not self.config.option.boxed:

Modified: py/branch/reporter-merge/py/test/terminal/remote.py
==============================================================================
--- py/branch/reporter-merge/py/test/terminal/remote.py	(original)
+++ py/branch/reporter-merge/py/test/terminal/remote.py	Fri Jan 25 14:30:54 2008
@@ -135,7 +135,6 @@
     session = config.initsession()
     session.shouldclose = channel.isclosed 
     print "SLAVE: starting session.main()"
-    session.main()
-    failures = session.getitemoutcomepairs(Failed)
+    failures = session.main()
     failures = [config.get_collector_trail(item) for item,_ in failures]
     channel.send(failures)

Modified: py/branch/reporter-merge/py/test/testing/test_remote.py
==============================================================================
--- py/branch/reporter-merge/py/test/testing/test_remote.py	(original)
+++ py/branch/reporter-merge/py/test/testing/test_remote.py	Fri Jan 25 14:30:54 2008
@@ -16,12 +16,13 @@
         cls = config._getsessionclass() 
         out = []  # out = py.std.Queue.Queue() 
         session = cls(config, out.append) 
-        session.main()
+        failures = session.main()
         for s in out: 
             if s.find('1 failed') != -1: 
                 break 
         else: 
-            py.test.fail("did not see test_1 failure") 
+            py.test.fail("did not see test_1 failure in output") 
+        assert failures 
 
     def test_looponfailing(self):
         o = tmpdir.ensure('looponfailing', dir=1)