[py-svn] r58107 - in py/trunk/contrib: filelog filelog/test py_unittest

pedronis at codespeak.net pedronis at codespeak.net
Sat Sep 13 15:39:39 CEST 2008


Author: pedronis
Date: Sat Sep 13 15:39:36 2008
New Revision: 58107

Added:
   py/trunk/contrib/filelog/   (props changed)
   py/trunk/contrib/filelog/__init__.py
   py/trunk/contrib/filelog/session.py
      - copied unchanged from r58084, pypy/branch/pypy-pytrunk/pypy/tool/pytest/filelog.py
   py/trunk/contrib/filelog/test/   (props changed)
   py/trunk/contrib/filelog/test/__init__.py
   py/trunk/contrib/filelog/test/test_filelog.py
      - copied, changed from r58084, pypy/branch/pypy-pytrunk/pypy/tool/pytest/test/test_filelog.py
Modified:
   py/trunk/contrib/py_unittest/   (props changed)
Log:
first step in moving experimental filelog session into contrib



Added: py/trunk/contrib/filelog/__init__.py
==============================================================================

Added: py/trunk/contrib/filelog/test/__init__.py
==============================================================================

Copied: py/trunk/contrib/filelog/test/test_filelog.py (from r58084, pypy/branch/pypy-pytrunk/pypy/tool/pytest/test/test_filelog.py)
==============================================================================
--- pypy/branch/pypy-pytrunk/pypy/tool/pytest/test/test_filelog.py	(original)
+++ py/trunk/contrib/filelog/test/test_filelog.py	Sat Sep 13 15:39:36 2008
@@ -1,6 +1,7 @@
 import py
 
-from pypy.tool.pytest import filelog
+from filelog import session
+
 import os, StringIO
 
 from py.__.test.collect import Node, Item, FSCollector
@@ -21,7 +22,7 @@
     p3 = Node('()', parent = p2)
     item = Item('c', parent = p3)
 
-    res = filelog.generic_path(item)
+    res = session.generic_path(item)
     assert res == 'a.B().c'
 
     p0 = FSCollector('proj/test', config='dummy')
@@ -31,7 +32,7 @@
     p4 = Node('c', parent=p3)
     item = Item('[1]', parent = p4)
 
-    res = filelog.generic_path(item)
+    res = session.generic_path(item)
     assert res == 'test/a:B().c[1]'
 
 
@@ -54,7 +55,7 @@
         option = Fake(eventlog=None)
         config = Fake(option=option)
         
-        filelog.FileLogSession(config)
+        session.FileLogSession(config)
 
     def test_open_logfile(self):
         logfname = os.tempnam()
@@ -62,7 +63,7 @@
         option = Fake(eventlog=None, filelog=logfname)        
         config = Fake(option=option)
         
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
 
         assert len(sess.bus._subscribers) == 1
 
@@ -75,7 +76,7 @@
     def test_write_log_entry(self):
         option = Fake(eventlog=None)
         config = Fake(option=option)
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
 
         sess.logfile = StringIO.StringIO()
         sess.write_log_entry('.', 'name', '')  
@@ -116,7 +117,7 @@
     def test_log_outcome(self):
         option = Fake(eventlog=None)
         config = Fake(option=option)
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
 
         sess.logfile = StringIO.StringIO()
         colitem = make_item('some', 'path', 'a', 'b')
@@ -141,7 +142,7 @@
     def test_item_test_passed(self):            
         option = Fake(eventlog=None)
         config = Fake(option=option)
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
         sess.logfile = StringIO.StringIO()
 
         colitem = make_item('proj/test', 'proj/test/mod', 'a', 'b')
@@ -160,7 +161,7 @@
     def test_collection_report(self):            
         option = Fake(eventlog=None)
         config = Fake(option=option)
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
         sess.logfile = StringIO.StringIO()
 
         colitem = make_item('proj/test', 'proj/test/mod', 'A', None)
@@ -188,7 +189,7 @@
         # at the end of the run
         option = Fake(eventlog=None)
         config = Fake(option=option)
-        sess = filelog.FileLogSession(config)
+        sess = session.FileLogSession(config)
         sess.logfile = StringIO.StringIO()
 
         try:



More information about the pytest-commit mailing list