[py-svn] r31502 - in py/branch/distributed/py/test: . rsession rsession/testing testing

[hpk at codespeak.net]

Author: hpk
Date: Tue Aug 22 19:48:47 2006
New Revision: 31502

Modified:
   py/branch/distributed/py/test/collect.py
   py/branch/distributed/py/test/rsession/slave.py
   py/branch/distributed/py/test/rsession/testing/test_slave.py
   py/branch/distributed/py/test/testing/test_collect.py
Log:
Introduce a getitembynames method for collectors. 



Modified: py/branch/distributed/py/test/collect.py
==============================================================================
--- py/branch/distributed/py/test/collect.py	(original)
+++ py/branch/distributed/py/test/collect.py	Tue Aug 22 19:48:47 2006
@@ -147,6 +147,16 @@
     def listnames(self): 
         return [x.name for x in self.listchain()]
 
+    def getitembynames(self, namelist):
+        if isinstance(namelist, str):
+            namelist = namelist.split("/")
+        cur = self
+        for name in namelist:
+            next = cur.join(name)
+            assert next is not None, (cur, name)
+            cur = next
+        return cur
+
     def haskeyword(self, keyword): 
         return keyword in self.name
 

Modified: py/branch/distributed/py/test/rsession/slave.py
==============================================================================
--- py/branch/distributed/py/test/rsession/slave.py	(original)
+++ py/branch/distributed/py/test/rsession/slave.py	Tue Aug 22 19:48:47 2006
@@ -9,18 +9,8 @@
     def __init__(self, rootcollector):
         self.rootcollector = rootcollector
 
-    def getitem(self, namelist):
-        if isinstance(namelist, str):
-            namelist = namelist.split("/")
-        cur = self.rootcollector
-        for name in namelist:
-            next = cur.join(name)
-            assert next is not None, (cur, name)
-            cur = next
-        return cur
-
     def execute(self, itemspec): 
-        item = self.getitem(itemspec)
+        item = self.rootcollector.getitembynames(itemspec)
         ex = Executor(item.obj, setup=item.setup)
         return ex.execute()
 

Modified: py/branch/distributed/py/test/rsession/testing/test_slave.py
==============================================================================
--- py/branch/distributed/py/test/rsession/testing/test_slave.py	(original)
+++ py/branch/distributed/py/test/rsession/testing/test_slave.py	Tue Aug 22 19:48:47 2006
@@ -25,14 +25,6 @@
     node = SlaveNode(rootcol) 
     return node
 
-def test_slave_getitem():
-    node = gettestnode()
-    item = node.getitem(funcpass_spec) 
-    assert isinstance(item, py.test.Item) 
-    assert item.name == 'funcpass' 
-    res = item.run()
-    assert res is None 
-
 def test_slave_run_passing():
     node = gettestnode()
     outcome = node.execute(funcpass_spec)

Modified: py/branch/distributed/py/test/testing/test_collect.py
==============================================================================
--- py/branch/distributed/py/test/testing/test_collect.py	(original)
+++ py/branch/distributed/py/test/testing/test_collect.py	Tue Aug 22 19:48:47 2006
@@ -24,6 +24,17 @@
     assert cur.parent == col.parent  
     assert cur.fspath == cur.fspath 
 
+def test_collect_listnames_and_back():
+    col1 = py.test.collect.Directory(datadir.dirpath())
+    col2 = col1.join(datadir.basename) 
+    col3 = col2.join('filetest.py')
+    l = col3.listnames()
+    assert len(l) == 3
+    x = col1.getitembynames(l[1:])
+    assert x.name == "filetest.py"
+    x = col1.getitembynames("/".join(l[1:]))
+    assert x.name == "filetest.py"
+
 def test_finds_tests(): 
     fn = datadir / 'filetest.py'
     col = py.test.collect.Module(fn)