[py-svn] r56593 - py/branch/event/py/test2

[hpk at codespeak.net]

Author: hpk
Date: Wed Jul 16 16:23:25 2008
New Revision: 56593

Modified:
   py/branch/event/py/test2/session.py
Log:
rename setup/teardown for Session objects
to avoid confusion with Item/Collector setup/teardown's 


Modified: py/branch/event/py/test2/session.py
==============================================================================
--- py/branch/event/py/test2/session.py	(original)
+++ py/branch/event/py/test2/session.py	Wed Jul 16 16:23:25 2008
@@ -41,17 +41,19 @@
         for x in genitems(self.config, colitems, keyword):
             yield x
 
-    def setup(self):
+    def sessionstarts(self):
         """ setup any neccessary resources ahead of the test run. """
+        self.config.bus.notify(repevent.SessionStart(self))
         if not self.config.option.nomagic:
             py.magic.invoke(assertion=1)
         self._failurelist = self._initfailurelist()
 
-    def teardown(self):
+    def sessionfinishes(self):
         """ teardown any resources after a test run. """ 
         self.config._setupstate.teardown_all()
         if not self.config.option.nomagic:
             py.magic.revoke(assertion=1)
+        self.config.bus.notify(repevent.SessionFinish(self))
         return self._failurelist 
 
     def _initfailurelist(self):
@@ -67,8 +69,7 @@
     def main(self):
         """ main loop for running tests. """
         self.shouldstop = False 
-        self.setup()
-        self.config.bus.notify(repevent.SessionStart(self))
+        self.sessionstarts()
         try:
             for item in self.collect(): 
                 if self.shouldstop: 
@@ -76,8 +77,7 @@
                 if not self.config.option.collectonly: 
                     self.runtest(item)
         finally:
-            failures = self.teardown()
-        self.config.bus.notify(repevent.SessionFinish(self))
+            failures = self.sessionfinishes()
         return failures 
 
     def runtest(self, item):