[py-svn] r57159 - py/branch/event/py/test2/dist

[hpk at codespeak.net]

Author: hpk
Date: Sun Aug 10 13:33:30 2008
New Revision: 57159

Modified:
   py/branch/event/py/test2/dist/async.py
Log:
remove one method, small optimization


Modified: py/branch/event/py/test2/dist/async.py
==============================================================================
--- py/branch/event/py/test2/dist/async.py	(original)
+++ py/branch/event/py/test2/dist/async.py	Sun Aug 10 13:33:30 2008
@@ -90,7 +90,7 @@
         elif isinstance(ev, repevent.ItemTestReport):
             all_completed = self.processresult(ev)
             if all_completed:
-                self.act_on_completed_tests()
+                self.triggershutdown() 
                 loopstate.exitstatus = self.EXIT_OK
                 return 
         elif isinstance(ev, repevent.CollectionReport):
@@ -106,22 +106,14 @@
                     exitstatus = loopstate.exitstatus
                     break 
         except KeyboardInterrupt:
-            #print py.code.ExceptionInfo().getrepr(funcargs=True)
-            #raise
             exitstatus = self.EXIT_INTERRUPTED
         except:
-            #raise
             self.bus.notify(repevent.InternalException())
             exitstatus = self.EXIT_INTERNALERROR
         if exitstatus == 0 and self._testsfailed:
             exitstatus = self.EXIT_TESTSFAILED
-        #while self.queue.qsize():
-        #    print self.queue.get()
         return exitstatus
 
-    def act_on_completed_tests(self):
-        self.triggershutdown() # XXX looponfailing 
-
     def triggershutdown(self):
         for host in self.hosts:
             host.node.shutdown()
@@ -166,9 +158,11 @@
         self.sendtestitems(senditems)
 
     def prunedeselected(self, colitems):
+        keywordexpr = self.config.option.keyword 
+        if not keywordexpr:
+            return colitems
         remaining = []
         deselected = []
-        keywordexpr = self.config.option.keyword 
         for colitem in colitems:
             if isinstance(colitem, Item):
                 if colitem._skipbykeyword(keywordexpr):