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

[hpk at codespeak.net]

Author: hpk
Date: Tue Aug 22 16:20:20 2006
New Revision: 31477

Modified:
   py/branch/distributed/py/test/rsession/slavenode.py
   py/branch/distributed/py/test/rsession/testing/test_slavenode.py
Log:
(fijal, hpk) add run method that returns serializes. 


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 16:20:20 2006
@@ -18,19 +18,11 @@
             cur = next
         return cur
 
-    def run(self, cmd, *args):
-        call = getattr(self, "run_" + cmd)
-        return call(*args)
-
-    def run_execitem(self, itemspec):
+    def execute(self, itemspec): 
         item = self.getitem(itemspec)
         ex = Executor(item.obj, setup=item.setup)
         return ex.execute()
 
-    def wrapped_run(self, cmd, *args):
-        outcome = self.run(cmd, *args)
-        call = gettattr(self, "wrap_" + cmd)
-        return call(outcome)
-
-    def wrap_execitem(self, outcome):
-        return repr(outcome)
+    def run(self, itemspec):
+        outcome = self.execute(itemspec)
+        return outcome.make_repr()

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 16:20:20 2006
@@ -27,8 +27,8 @@
 
 def test_slavenode_run_passing():
     node = gettestnode()
-    outcome = node.run("execitem", 
-        "py/test/rsession/testing/test_slavenode.py/funcpass")
+    outcome = node.execute("py/test/rsession/testing/"
+                           "test_slavenode.py/funcpass")
     assert outcome.passed 
     assert not outcome.setupfailure 
 
@@ -39,8 +39,8 @@
 
 def test_slavenode_run_failing():
     node = gettestnode()
-    outcome = node.run("execitem", 
-        "py/test/rsession/testing/test_slavenode.py/funcfail")
+    outcome = node.execute("py/test/rsession/testing/"
+                           "test_slavenode.py/funcfail")
     assert not outcome.passed 
     assert not outcome.setupfailure 
     assert len(outcome.excinfo.traceback) == 1
@@ -52,6 +52,17 @@
     assert not reproutcome.setupfailure 
     assert reproutcome.excinfo
 
+def test_slavenode_run_failing_wrapped():
+    node = gettestnode()
+    repr_outcome = node.run("py/test/rsession/testing/"
+                       "test_slavenode.py/funcfail")
+    outcome = ReprOutcome(repr_outcome)  
+    assert not outcome.passed 
+    assert not outcome.setupfailure 
+    assert outcome.excinfo
+
+
+
 #def test_slavenode_dispatch_failing(self):
 #    node = SlaveNode() 
 #    outcome = node.run("execitem",