[py-svn] r38033 - py/trunk/py/test/rsession/testing

[fijal at codespeak.net]

Author: fijal
Date: Tue Feb  6 21:36:03 2007
New Revision: 38033

Modified:
   py/trunk/py/test/rsession/testing/basetest.py
   py/trunk/py/test/rsession/testing/test_executor.py
   py/trunk/py/test/rsession/testing/test_reporter.py
   py/trunk/py/test/rsession/testing/test_rsession.py
Log:
Fix tests once again


Modified: py/trunk/py/test/rsession/testing/basetest.py
==============================================================================
--- py/trunk/py/test/rsession/testing/basetest.py	(original)
+++ py/trunk/py/test/rsession/testing/basetest.py	Tue Feb  6 21:36:03 2007
@@ -44,3 +44,6 @@
         col = self.collector_test_one.join(funcname)
         assert col is not None, funcname
         return col 
+
+    def getmod(self):
+        return self.collector_test_one

Modified: py/trunk/py/test/rsession/testing/test_executor.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_executor.py	(original)
+++ py/trunk/py/test/rsession/testing/test_executor.py	Tue Feb  6 21:36:03 2007
@@ -5,7 +5,7 @@
 from py.__.test.rsession.executor import RunExecutor, BoxExecutor,\
     AsyncExecutor, ApigenExecutor
 from py.__.test.rsession.outcome import ReprOutcome
-from py.__.test.rsession.testing.runtest import BasicRsessionTest
+from py.__.test.rsession.testing.basetest import BasicRsessionTest
 
 #def setup_module(mod):
 #    mod.rootdir = py.path.local(py.__file__).dirpath().dirpath()
@@ -58,7 +58,7 @@
         assert not outcome.excinfo 
 
     def test_box_executor_stdout(self):
-        item = self.rootcol._getitembynames(self.funcprint_spec)
+        item = self.getexample("print")
         ex = BoxExecutor(item, config=self.config)
         outcome_repr = ex.execute()
         outcome = ReprOutcome(outcome_repr)
@@ -66,7 +66,7 @@
         assert outcome.stdout.find("samfing") != -1
 
     def test_box_executor_stdout_error(self):
-        item = self.rootcol._getitembynames(self.funcprintfail_spec)
+        item = self.getexample("printfail")
         ex = BoxExecutor(item, config=self.config)
         outcome_repr = ex.execute()
         outcome = ReprOutcome(outcome_repr)
@@ -74,7 +74,7 @@
         assert outcome.stdout.find("samfing elz") != -1 
 
     def test_cont_executor(self):
-        item = self.rootcol._getitembynames(self.funcprintfail_spec)
+        item = self.getexample("printfail")
         ex = AsyncExecutor(item, config=self.config)
         cont, pid = ex.execute()
         assert pid

Modified: py/trunk/py/test/rsession/testing/test_reporter.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_reporter.py	(original)
+++ py/trunk/py/test/rsession/testing/test_reporter.py	Tue Feb  6 21:36:03 2007
@@ -25,7 +25,7 @@
 from py.__.test.rsession.outcome import ReprOutcome, Outcome
 from py.__.test.rsession.hostmanage import HostInfo
 from py.__.test.rsession.box import Box
-from py.__.test.rsession.testing.runtest import BasicRsessionTest
+from py.__.test.rsession.testing.basetest import BasicRsessionTest
 import sys
 from StringIO import StringIO
 
@@ -57,7 +57,7 @@
         return outcomes
     
     def report_received_item_outcome(self):
-        item = self.rootcol._getitembynames(self.funcpass_spec)
+        item = self.getexample("pass")
         outcomes = self.prepare_outcomes()
         
         def boxfun(config, item, outcomes):
@@ -74,8 +74,8 @@
         return out
 
     def _test_module(self):
-        funcitem = self.rootcol._getitembynames(self.funcpass_spec)
-        moditem = self.rootcol._getitembynames(self.mod_spec)
+        funcitem = self.getexample("pass")
+        moditem = self.getmod()
         outcomes = self.prepare_outcomes()
         
         def boxfun(config, item, funcitem, outcomes):

Modified: py/trunk/py/test/rsession/testing/test_rsession.py
==============================================================================
--- py/trunk/py/test/rsession/testing/test_rsession.py	(original)
+++ py/trunk/py/test/rsession/testing/test_rsession.py	Tue Feb  6 21:36:03 2007
@@ -6,7 +6,7 @@
 from py.__.test.rsession import repevent
 from py.__.test.rsession.rsession import RSession 
 from py.__.test.rsession.hostmanage import HostManager, HostInfo
-from py.__.test.rsession.testing.runtest import BasicRsessionTest
+from py.__.test.rsession.testing.basetest import BasicRsessionTest
 from py.__.test.rsession.testing.test_hostmanage import DirSetup
 
 def setup_module(mod):
@@ -148,10 +148,10 @@
         from py.__.test.rsession.testing.test_executor \
             import ItemTestPassing, ItemTestFailing, ItemTestSkipping
         
-        itempass = self.rootcol._getitembynames(self.funcpass_spec)
-        itemfail = self.rootcol._getitembynames(self.funcfail_spec)
-        itemskip = self.rootcol._getitembynames(self.funcskip_spec)
-        itemprint = self.rootcol._getitembynames(self.funcprint_spec)
+        itempass = self.getexample("pass")
+        itemfail = self.getexample("fail")
+        itemskip = self.getexample("skip")
+        itemprint = self.getexample("print")
 
         # actually run some tests
         for node in nodes: