[py-svn] r37243 - in py/branch/config/py/test: . terminal testing

[hpk at codespeak.net]

Author: hpk
Date: Wed Jan 24 00:06:24 2007
New Revision: 37243

Modified:
   py/branch/config/py/test/config.py
   py/branch/config/py/test/session.py
   py/branch/config/py/test/terminal/remote.py
   py/branch/config/py/test/testing/test_config.py
Log:
small step-wise cleanups


Modified: py/branch/config/py/test/config.py
==============================================================================
--- py/branch/config/py/test/config.py	(original)
+++ py/branch/config/py/test/config.py	Wed Jan 24 00:06:24 2007
@@ -26,13 +26,13 @@
 class Config(object): 
     """ central hub for dealing with configuration/initialization data. """ 
     Option = optparse.Option
-    conftest = Conftest()
-    _initialized = False
 
     def __init__(self): 
         self.option = CmdOptions()
         self._parser = optparse.OptionParser(
             usage="usage: %prog [options] [query] [filenames of tests]")
+        self.conftest = Conftest()
+        self._initialized = False
         self._overwrite_dict = {}
 
     def parse(self, args): 
@@ -212,7 +212,13 @@
             starting from a different topdir). 
         """ 
         chain = collector.listchain()
-        relpath = chain[0].fspath.relto(self.topdir) or '.'
+        relpath = chain[0].fspath.relto(self.topdir)
+        if not relpath:
+            if chain[0].fspath == self.topdir:
+                relpath = "."
+            else:
+                raise ValueError("%r not relative to %s" 
+                         %(chain[0], self.topdir))
         return relpath, tuple([x.name for x in chain[1:]])
 
 # this is the one per-process instance of py.test configuration 

Modified: py/branch/config/py/test/session.py
==============================================================================
--- py/branch/config/py/test/session.py	(original)
+++ py/branch/config/py/test/session.py	Wed Jan 24 00:06:24 2007
@@ -43,7 +43,6 @@
             self.header(colitems) 
             try:
                 for colitem in colitems: 
-                    colitem.option = self.config.option
                     self.runtraced(colitem)
             except KeyboardInterrupt: 
                 raise 
@@ -53,9 +52,6 @@
                 self.footer(colitems) 
         except Exit, ex:
             pass
-        # return [(fspath as string, [names as string])]
-        return [(str(item.listchain()[0].fspath), item.listnames())
-                for item, outcome in self.getitemoutcomepairs(py.test.Item.Failed)]
 
     def runtraced(self, colitem):
         if self.shouldclose(): 

Modified: py/branch/config/py/test/terminal/remote.py
==============================================================================
--- py/branch/config/py/test/terminal/remote.py	(original)
+++ py/branch/config/py/test/terminal/remote.py	Wed Jan 24 00:06:24 2007
@@ -120,12 +120,14 @@
     config.option.usepdb = False 
     config.option.executable = None
 
+    session = config.initsession()
+    session.shouldclose = channel.isclosed 
     if failures: 
         cols = getfailureitems(failures) 
     else:
         cols = args 
-    session = config.initsession()
-    session.shouldclose = channel.isclosed 
-    print "SLAVE: received configuration" 
-    failures = session.main()
+    print "SLAVE: starting session.main()"
+    session.main()
+    failures = session.getitemoutcomepairs(py.test.Item.Failed)
+    failures = [config.get_collector_trail(item) for item,_ in failures]
     channel.send(failures)

Modified: py/branch/config/py/test/testing/test_config.py
==============================================================================
--- py/branch/config/py/test/testing/test_config.py	(original)
+++ py/branch/config/py/test/testing/test_config.py	Wed Jan 24 00:06:24 2007
@@ -337,3 +337,6 @@
         col2 = config._getcollector(trail)
         assert col2.fspath == config.topdir
         assert len(col2.listchain()) == 1
+        col3 = config._getcollector(config.topdir.dirpath())
+        py.test.raises(ValueError, 
+              "config.get_collector_trail(col3)")