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

[hpk at codespeak.net]

Author: hpk
Date: Wed Aug 23 16:59:29 2006
New Revision: 31556

Modified:
   py/branch/distributed/py/test/rsession/master.py
   py/branch/distributed/py/test/rsession/rsession.py
   py/branch/distributed/py/test/rsession/testing/test_master.py
Log:
(fijal, hpk) always assume that itemspec's have a containing collector around the package 


Modified: py/branch/distributed/py/test/rsession/master.py
==============================================================================
--- py/branch/distributed/py/test/rsession/master.py	(original)
+++ py/branch/distributed/py/test/rsession/master.py	Wed Aug 23 16:59:29 2006
@@ -23,7 +23,7 @@
 
     def send(self, item):
         self.pending.insert(0, item)
-        itemspec = item.listnames()
+        itemspec = item.listnames()[1:]
         self.channel.send(itemspec)
         # send start report
         self.reporter(report.SendItem(self.channel, item))

Modified: py/branch/distributed/py/test/rsession/rsession.py
==============================================================================
--- py/branch/distributed/py/test/rsession/rsession.py	(original)
+++ py/branch/distributed/py/test/rsession/rsession.py	Wed Aug 23 16:59:29 2006
@@ -67,6 +67,7 @@
         nodes = init_hosts(self.report, sshhosts, relpath, rootdir)
 
         itemgenerator = colitems[0].tryiter()
+        #assert 0, "\n".join([",".join(x.listnames()) for x in list(itemgenerator)])
         dispatch_loop(nodes, itemgenerator, lambda : False)
         teardown_hosts(self.report, [node.channel for node in nodes])
         

Modified: py/branch/distributed/py/test/rsession/testing/test_master.py
==============================================================================
--- py/branch/distributed/py/test/rsession/testing/test_master.py	(original)
+++ py/branch/distributed/py/test/rsession/testing/test_master.py	Wed Aug 23 16:59:29 2006
@@ -89,9 +89,7 @@
     rootcol = py.test.collect.Directory(rootdir)
     funcpass_item = rootcol.getitembynames(funcpass_spec)
     funcfail_item = rootcol.getitembynames(funcfail_spec)
-    # XXX: Just make this test pass
-    funcpass_item.parent.parent.parent.parent.parent.parent = None
-    funcfail_item.parent.parent.parent.parent.parent.parent = None
-    itemgenerator = iter([funcfail_item] + [funcpass_item] * 5 + [funcfail_item] * 5)
+    itemgenerator = iter([funcfail_item] + 
+                         [funcpass_item] * 5 + [funcfail_item] * 5)
     shouldstop = lambda : False
     dispatch_loop(master_nodes, itemgenerator, shouldstop)