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

[hpk at codespeak.net]

Author: hpk
Date: Tue Aug 22 17:42:41 2006
New Revision: 31489

Removed:
   py/branch/distributed/py/test/rsession/slave_main.py
   py/branch/distributed/py/test/rsession/testing/test_slavemain.py
Modified:
   py/branch/distributed/py/test/rsession/masternode.py
   py/branch/distributed/py/test/rsession/slavenode.py
   py/branch/distributed/py/test/rsession/testing/test_slavenode.py
Log:
(fijal, hpk) removing one file.


Modified: py/branch/distributed/py/test/rsession/masternode.py
==============================================================================
--- py/branch/distributed/py/test/rsession/masternode.py	(original)
+++ py/branch/distributed/py/test/rsession/masternode.py	Tue Aug 22 17:42:41 2006
@@ -19,3 +19,12 @@
         self.pending.insert(0, item)
         itemspec = "/".join(item.listnames())
         self.channel.send(itemspec)
+
+# master side: 
+# gw = SshGateway(sshhost)
+# rsync -az --delete --exclude=.svn %(source)s %(sshhost)s:%(path)s
+# c = gw.remote_exec(slave_main) 
+# c.send(path)
+#
+
+

Deleted: /py/branch/distributed/py/test/rsession/slave_main.py
==============================================================================
--- /py/branch/distributed/py/test/rsession/slave_main.py	Tue Aug 22 17:42:41 2006
+++ (empty file)
@@ -1,20 +0,0 @@
-
-# master side: 
-# gw = SshGateway(sshhost)
-# rsync -az --delete --exclude=.svn %(source)s %(sshhost)s:%(path)s
-# c = gw.remote_exec(slave_main) 
-# c.send(path)
-#
-import py
-from py.__.test.rsession.slavenode import SlaveNode
-
-def slave_main(receive, send): 
-    path = receive()
-    rootcol = py.test.collect.Directory(path)
-    node = SlaveNode(rootcol)
-    while 1:
-        nextitem = receive()
-        if nextitem is None:
-            break
-        res = node.run(nextitem) 
-        send(res)

Modified: py/branch/distributed/py/test/rsession/slavenode.py
==============================================================================
--- py/branch/distributed/py/test/rsession/slavenode.py	(original)
+++ py/branch/distributed/py/test/rsession/slavenode.py	Tue Aug 22 17:42:41 2006
@@ -2,6 +2,7 @@
 Node code for slaves. 
 """
 
+import py
 from py.__.test.rsession.executor import Executor 
 
 class SlaveNode(object):
@@ -26,3 +27,14 @@
     def run(self, itemspec):
         outcome = self.execute(itemspec)
         return outcome.make_repr()
+
+def slave_main(receive, send): 
+    path = receive()
+    rootcol = py.test.collect.Directory(path)
+    node = SlaveNode(rootcol)
+    while 1:
+        nextitem = receive()
+        if nextitem is None:
+            break
+        res = node.run(nextitem) 
+        send(res)

Deleted: /py/branch/distributed/py/test/rsession/testing/test_slavemain.py
==============================================================================
--- /py/branch/distributed/py/test/rsession/testing/test_slavemain.py	Tue Aug 22 17:42:41 2006
+++ (empty file)
@@ -1,22 +0,0 @@
-
-""" Test main slave loop
-"""
-
-import py
-from py.__.test.rsession.slave_main import slave_main
-from py.__.test.rsession.outcome import ReprOutcome
-
-rootdir = py.path.local(py.__file__).dirpath().dirpath()
-
-test_q = [None, "py/test/rsession/testing/test_slavenode.py/funcpass",
-                "py/test/rsession/testing/test_slavenode.py/funcfail",
-                 str(rootdir)]
-
-def test_simple_test():
-    res = []
-    q = test_q[:]
-    slave_main(q.pop, res.append)
-    assert len(res) == 2
-    res_repr = [ReprOutcome(r) for r in res]
-    assert not res_repr[0].passed
-    assert res_repr[1].passed

Modified: py/branch/distributed/py/test/rsession/testing/test_slavenode.py
==============================================================================
--- py/branch/distributed/py/test/rsession/testing/test_slavenode.py	(original)
+++ py/branch/distributed/py/test/rsession/testing/test_slavenode.py	Tue Aug 22 17:42:41 2006
@@ -1,9 +1,11 @@
 
 """ Testing the slave side node code (in a local way). """
-from py.__.test.rsession.slavenode import SlaveNode 
+from py.__.test.rsession.slavenode import SlaveNode, slave_main
+from py.__.test.rsession.outcome import ReprOutcome
 import py
 
-from py.__.test.rsession.outcome import ReprOutcome
+def setup_module(mod):
+    mod.rootdir = py.path.local(py.__file__).dirpath().dirpath()
 
 def funcpass(): 
     pass
@@ -12,7 +14,6 @@
     raise AssertionError("hello world")
 
 def gettestnode():
-    rootdir = py.path.local(py.__file__).dirpath().dirpath()
     rootcol = py.test.collect.Directory(rootdir)
     node = SlaveNode(rootcol) 
     return node
@@ -61,13 +62,16 @@
     assert not outcome.setupfailure 
     assert outcome.excinfo
 
+def test_slave_main_simple(): 
+    res = []
+    q = [None, 
+         "py/test/rsession/testing/test_slavenode.py/funcpass",
+         "py/test/rsession/testing/test_slavenode.py/funcfail",
+         str(rootdir)]
+    slave_main(q.pop, res.append)
+    assert len(res) == 2
+    res_repr = [ReprOutcome(r) for r in res]
+    assert not res_repr[0].passed
+    assert res_repr[1].passed
 
 
-#def test_slavenode_dispatch_failing(self):
-#    node = SlaveNode() 
-#    outcome = node.run("execitem", 
-#             "py.__.test.rsession.testing.test_slavenode.funcpass"
-#             .split('.'),
-#    )
-#    assert not outcome.haspassed()
-#    assert outcome.excinfo.type == AssertionError