[py-svn] r56978 - in py/branch/event/py/test2: . testing

[hpk at codespeak.net]

Author: hpk
Date: Mon Aug  4 17:38:17 2008
New Revision: 56978

Modified:
   py/branch/event/py/test2/config.py
   py/branch/event/py/test2/session.py
   py/branch/event/py/test2/testing/test_collect.py
   py/branch/event/py/test2/testing/test_config.py
Log:
remove another unused method from config 


Modified: py/branch/event/py/test2/config.py
==============================================================================
--- py/branch/event/py/test2/config.py	(original)
+++ py/branch/event/py/test2/config.py	Mon Aug  4 17:38:17 2008
@@ -81,10 +81,6 @@
         self._conftest.setinitial(self.args)
         self.option = cmdlineopts
 
-    def getcolitems(self):
-        """ return initial collectors. """
-        return [self.getfsnode(path) for path in self.args]
-
     def getfsnode(self, path):
         path = py.path.local(path)
         assert path.check(), "%s: path does not exist" %(path,)

Modified: py/branch/event/py/test2/session.py
==============================================================================
--- py/branch/event/py/test2/session.py	(original)
+++ py/branch/event/py/test2/session.py	Mon Aug  4 17:38:17 2008
@@ -65,7 +65,7 @@
                 self.bus.notify(repevent.CollectionFinish(next, runinfo))
 
     def collect(self): 
-        colitems = self.config.getcolitems()
+        colitems = [self.config.getfsnode(arg) for arg in self.config.args]
         keyword = self.config.option.keyword
         for x in self.genitems(colitems, keyword):
             yield x
@@ -119,4 +119,3 @@
                       getcapture=self.config._getcapture,
                       pdb=pdb)
         self.bus.notify(testrep)
-

Modified: py/branch/event/py/test2/testing/test_collect.py
==============================================================================
--- py/branch/event/py/test2/testing/test_collect.py	(original)
+++ py/branch/event/py/test2/testing/test_collect.py	Mon Aug  4 17:38:17 2008
@@ -5,6 +5,7 @@
 from py.__.test2.conftesthandle import Conftest
 from py.__.test2.collect import SetupState
 from py.__.test2.pycollect import DoctestText
+from test_config import getcolitems
 
 class DummyConfig:
     def __init__(self):
@@ -296,7 +297,7 @@
         config = py.test2.config._reparse([tmp])
         session = config.initsession()
         l = suptest.eventappender(session)
-        items = list(session.genitems(config.getcolitems()))
+        items = list(session.genitems(getcolitems(config)))
         return items, l 
 
     def test_check_collect_hashes(self):

Modified: py/branch/event/py/test2/testing/test_config.py
==============================================================================
--- py/branch/event/py/test2/testing/test_config.py	(original)
+++ py/branch/event/py/test2/testing/test_config.py	Mon Aug  4 17:38:17 2008
@@ -4,6 +4,9 @@
 from py.__.test2.config import gettopdir
 import suptest, setupdata
 
+def getcolitems(config):
+    return [config.getfsnode(arg) for arg in config.args]
+    
 def test_tmpdir():
     d1 = py.test2.ensuretemp('hello') 
     d2 = py.test2.ensuretemp('hello') 
@@ -132,10 +135,9 @@
     config2._initialized = False # we have to do that from tests
     config2._repr = config._makerepr()
     config2._initafterpickle(topdir=tmp.dirpath())
-    for col1, col2 in zip(config.getcolitems(), config2.getcolitems()):
+    for col1, col2 in zip(getcolitems(config), getcolitems(config2)):
         assert col1.fspath == col2.fspath
-    from py.__.test2.config import Config
-    cols = config2.getcolitems()
+    cols = getcolitems(config2)
     assert len(cols) == 1
     col = cols[0]
     assert col.name == 'test_hello.py'
@@ -358,7 +360,7 @@
     
     def test_getcolitems_onedir(self):
         config = py.test2.config._reparse([self.tmpdir])
-        colitems = config.getcolitems()
+        colitems = getcolitems(config)
         assert len(colitems) == 1
         col = colitems[0]
         assert isinstance(col, py.test2.collect.Directory)
@@ -367,7 +369,7 @@
 
     def test_getcolitems_twodirs(self):
         config = py.test2.config._reparse([self.tmpdir, self.tmpdir])
-        colitems = config.getcolitems()
+        colitems = getcolitems(config)
         assert len(colitems) == 2
         col1, col2 = colitems 
         assert col1.name == col2.name 
@@ -376,7 +378,7 @@
     def test_getcolitems_curdir_and_subdir(self):
         a = self.tmpdir.ensure("a", dir=1)
         config = py.test2.config._reparse([self.tmpdir, a])
-        colitems = config.getcolitems()
+        colitems = getcolitems(config)
         assert len(colitems) == 2
         col1, col2 = colitems 
         assert col1.name == self.tmpdir.basename