[py-svn] r10548 - py/branch/py-collect/test/tkinter

[jan at codespeak.net]

Author: jan
Date: Tue Apr 12 16:13:16 2005
New Revision: 10548

Modified:
   py/branch/py-collect/test/tkinter/guisession.py
   py/branch/py-collect/test/tkinter/util.py
Log:
fixes exception in GuiSession


Modified: py/branch/py-collect/test/tkinter/guisession.py
==============================================================================
--- py/branch/py-collect/test/tkinter/guisession.py	(original)
+++ py/branch/py-collect/test/tkinter/guisession.py	Tue Apr 12 16:13:16 2005
@@ -34,7 +34,7 @@
     def finish(self, colitem, res):
         super(GuiSession, self).finish(colitem, res)
         report = self.reportlist.pop()
-        report.finish(colitem, res, self.config.option)
+        report.finish(colitem, res, self.config)
         self.reportlist[-1].status.update(report.status)
         self.sendreport(report)
         #py.std.time.sleep(0.5)

Modified: py/branch/py-collect/test/tkinter/util.py
==============================================================================
--- py/branch/py-collect/test/tkinter/util.py	(original)
+++ py/branch/py-collect/test/tkinter/util.py	Tue Apr 12 16:13:16 2005
@@ -166,7 +166,7 @@
                                collector.listnames())
         self.status = Status.NotExecuted()
 
-    def finish(self, collector, res, option = Null()):
+    def finish(self, collector, res, config = Null()):
         '''Session.finish should call this to set the
         value of error_report
         option is passed to Session at initialization'''
@@ -181,9 +181,9 @@
             self.label = collector.name + str_append
         if res:
             if Status(res) in (Status.Failed(), Status.ExceptionFailure()):
-                self.error_report = self.report_failed(option, collector, res)
+                self.error_report = self.report_failed(config, collector, res)
             elif Status(res) ==  Status.Skipped():
-                self.error_report = self.report_skipped(option, collector, res)
+                self.error_report = self.report_skipped(config, collector, res)
             self.status.update(Status(res))
         self.finished = True
 
@@ -197,15 +197,15 @@
             base = base + "_" * (13-len(base))
         return base + "_" + basename 
 
-    def report_failed(self, option, item, res):
+    def report_failed(self, config, item, res):
         #XXX hack abuse of TerminalSession
-        terminal = py.test.TerminalSession(option)
+        terminal = py.test.TerminalSession(config)
         out = OutBuffer()
         terminal.out = out
         terminal.repr_failure(item, res)
         return out.getoutput()
 
-    def report_skipped(self, option, item, res):
+    def report_skipped(self, config, item, res):
         texts = {}
         tbindex = getattr(res, 'tbindex', -1)
         raisingtb = res.excinfo.traceback[tbindex]