[py-svn] r57008 - in py/branch/event/py/test2: . testing

[hpk at codespeak.net]

Author: hpk
Date: Tue Aug  5 18:28:28 2008
New Revision: 57008

Modified:
   py/branch/event/py/test2/repevent.py
   py/branch/event/py/test2/session.py
   py/branch/event/py/test2/testing/test_session.py
Log:
remove duplicate CollectionFinish event


Modified: py/branch/event/py/test2/repevent.py
==============================================================================
--- py/branch/event/py/test2/repevent.py	(original)
+++ py/branch/event/py/test2/repevent.py	Tue Aug  5 18:28:28 2008
@@ -33,18 +33,6 @@
         self.session = session 
         self.timeend = time.time()
 
-# ----------------------------------------------------------------------
-# Events related to collecting Collectors 
-# ----------------------------------------------------------------------
-
-class CollectionStart(BaseEvent):
-    def __init__(self, collector):
-        self.collector = collector 
-
-class CollectionFinish(BaseEvent):
-    def __init__(self, collector, runinfo=None):
-        self.collector = collector
-        self.runinfo = runinfo
 
 # ----------------------------------------------------------------------
 # Events related to collecting and executing test Items 
@@ -72,12 +60,15 @@
 class ItemTestReport(BaseReport):
     """ Test Execution Report. """
 
+class CollectionStart(BaseEvent):
+    def __init__(self, collector):
+        self.collector = collector 
+
 class CollectionReport(BaseReport):
     """ Collection Report. """
     def __init__(self, colitem, result, **kwargs):
         super(CollectionReport, self).__init__(colitem, **kwargs)
         self.result = result
-        
 
 # ----------------------------------------------------------------------
 # Distributed Testing Events 

Modified: py/branch/event/py/test2/session.py
==============================================================================
--- py/branch/event/py/test2/session.py	(original)
+++ py/branch/event/py/test2/session.py	Tue Aug  5 18:28:28 2008
@@ -62,9 +62,7 @@
                 if ev.passed:
                     for x in self.genitems(ev.result, keywordexpr):
                         yield x 
-                    self.bus.notify(repevent.CollectionFinish(next))
-                else:
-                    self.bus.notify(ev)
+                self.bus.notify(ev)
 
     def collect(self): 
         colitems = [self.config.getfsnode(arg) for arg in self.config.args]

Modified: py/branch/event/py/test2/testing/test_session.py
==============================================================================
--- py/branch/event/py/test2/testing/test_session.py	(original)
+++ py/branch/event/py/test2/testing/test_session.py	Tue Aug  5 18:28:28 2008
@@ -204,14 +204,13 @@
         assert len(itemstarted) == 3
         assert not sorter.get(repevent.ItemTestReport) 
         started = sorter.get(repevent.CollectionStart)
-        colnotpassed = sorter.get(repevent.CollectionReport)
-        finished = sorter.get(repevent.CollectionFinish) + \
-                   sorter.get(repevent.CollectionReport)
+        finished = sorter.get(repevent.CollectionReport)
         assert len(started) == len(finished) 
         assert len(started) == 8 
-        assert len(colnotpassed) == 2
-        assert colnotpassed[0].failed
-        assert colnotpassed[1].skipped
+        colfail = [x for x in finished if x.failed]
+        colskipped = [x for x in finished if x.skipped]
+        assert len(colfail) == 1
+        assert len(colskipped) == 1
 
     def test_pdb_run(self):
         tfile = suptest.makeuniquepyfile("""