vastly simplify and cleanup collection initialization by internally

introducing a RootCollector. Note that the internal node
methods _fromtrail and _totrail are shifted to the still internal
config._rootcol.fromtrail/totrail

--HG--
branch : trunk
This commit is contained in:
holger krekel
2010-01-03 01:02:44 +01:00
parent eebeb1b257
commit 1b34492108
9 changed files with 127 additions and 165 deletions
+4 -4
View File
@@ -4,9 +4,9 @@ from py.plugin.pytest_resultlog import generic_path, ResultLog
from py.impl.test.collect import Node, Item, FSCollector
def test_generic_path(testdir):
config = testdir.Config()
p1 = Node('a', config=config)
assert p1.fspath is None
config = testdir.parseconfig()
p1 = Node('a', parent=config._rootcol)
#assert p1.fspath is None
p2 = Node('B', parent=p1)
p3 = Node('()', parent = p2)
item = Item('c', parent = p3)
@@ -14,7 +14,7 @@ def test_generic_path(testdir):
res = generic_path(item)
assert res == 'a.B().c'
p0 = FSCollector('proj/test', config=config)
p0 = FSCollector('proj/test', parent=config._rootcol)
p1 = FSCollector('proj/test/a', parent=p0)
p2 = Node('B', parent=p1)
p3 = Node('()', parent = p2)