[py-svn] r33350 - in py/dist/py: . code test/rsession
fijal at codespeak.net
fijal at codespeak.net
Mon Oct 16 22:49:08 CEST 2006
Author: fijal
Date: Mon Oct 16 22:48:34 2006
New Revision: 33350
Modified:
py/dist/py/__init__.py
py/dist/py/code/excinfo.py
py/dist/py/code/traceback2.py
py/dist/py/test/rsession/rsession.py
Log:
Missing commit. Some minor changes to API of code objects (helpers). Also refactored LocalReporter to look like py.test local.
Modified: py/dist/py/__init__.py
==============================================================================
--- py/dist/py/__init__.py (original)
+++ py/dist/py/__init__.py Mon Oct 16 22:48:34 2006
@@ -39,6 +39,7 @@
'test.Session' : ('./test/session.py', 'Session'),
'test.TerminalSession' : ('./test/terminal/terminal.py', 'TerminalSession'),
'test.RSession' : ('./test/rsession/rsession.py', 'RSession'),
+ 'test.LSession' : ('./test/rsession/rsession.py', 'LSession'),
'test.TkinterSession' : ('./test/tkinter/tksession.py', 'TkSession'),
'test.collect.Collector' : ('./test/collect.py', 'Collector'),
'test.collect.Directory' : ('./test/collect.py', 'Directory'),
Modified: py/dist/py/code/excinfo.py
==============================================================================
--- py/dist/py/code/excinfo.py (original)
+++ py/dist/py/code/excinfo.py Mon Oct 16 22:48:34 2006
@@ -18,6 +18,7 @@
self._striptext = 'AssertionError: '
self._excinfo = tup
self.type, self.value, tb = self._excinfo
+ self.typename = str(self.type)
self.traceback = py.code.Traceback(tb)
def exconly(self, tryshort=False):
Modified: py/dist/py/code/traceback2.py
==============================================================================
--- py/dist/py/code/traceback2.py (original)
+++ py/dist/py/code/traceback2.py Mon Oct 16 22:48:34 2006
@@ -8,6 +8,7 @@
self._rawentry = rawentry
self.frame = py.code.Frame(rawentry.tb_frame)
self.lineno = rawentry.tb_lineno - 1
+ self.relline = self.lineno - self.frame.code.firstlineno
def __repr__(self):
return "<TracebackEntry %s:%d>" %(self.frame.code.path, self.lineno+1)
@@ -55,6 +56,7 @@
end = i + 1
break
return source[start:end]
+ source = property(getsource)
def ishidden(self):
try:
Modified: py/dist/py/test/rsession/rsession.py
==============================================================================
--- py/dist/py/test/rsession/rsession.py (original)
+++ py/dist/py/test/rsession/rsession.py Mon Oct 16 22:48:34 2006
@@ -242,6 +242,33 @@
def get_item_name(self, event, colitem):
return "/".join(colitem.listnames())
+ def report_ReceivedItemOutcome(self, event):
+ if event.outcome.passed:
+ self.passed['localhost'] += 1
+ self.out.write(".")
+ elif event.outcome.skipped:
+ self.skipped_tests_outcome.append(event)
+ self.skipped['localhost'] += 1
+ self.out.write("s")
+ else:
+ self.failed['localhost'] += 1
+ self.failed_tests_outcome.append(event)
+ self.out.write("F")
+ # we'll take care of them later
+ self.count += 1
+ if self.count >= self.lgt:
+ self.out.write("\n")
+ #itempath = " ".join(event.item.listnames()[1:])
+ #print "%10s: %s %s" %(sshhost[:10], status, itempath)
+
+ def report_ItemStart(self, event):
+ item = event.item
+ if isinstance(item, py.test.collect.Module):
+ self.count = 0
+ lgt = len(list(event.item.tryiter()))
+ self.lgt = lgt
+ self.out.write("%s[%d] " % (item.name, lgt))
+
def hangs(self):
pass
More information about the pytest-commit
mailing list