[py-svn] r56667 - in py/branch/event/py/test2: . testing

[hpk at codespeak.net]

Author: hpk
Date: Sat Jul 19 13:00:35 2008
New Revision: 56667

Modified:
   py/branch/event/py/test2/executor.py
   py/branch/event/py/test2/item.py
   py/branch/event/py/test2/testing/test_executor.py
Log:
strike redunant config argument


Modified: py/branch/event/py/test2/executor.py
==============================================================================
--- py/branch/event/py/test2/executor.py	(original)
+++ py/branch/event/py/test2/executor.py	Sat Jul 19 13:00:35 2008
@@ -10,9 +10,9 @@
 class RunExecutor(object):
     """ Same as in executor, but just running run
     """
-    def __init__(self, item, config): 
+    def __init__(self, item): 
         self.item = item
-        self.config = config
+        self.config = item._config
         self.outerr = None
 
     def runitem(self):
@@ -65,8 +65,8 @@
     """ Same as RunExecutor, but takes tracer to trace calls as
     an argument to execute
     """
-    def __init__(self, item, config, tracer):
-        super(ApigenExecutor, self).__init__(item, config) 
+    def __init__(self, item, tracer):
+        super(ApigenExecutor, self).__init__(item)
         self.tracer = tracer 
 
     def runitem(self):
@@ -85,9 +85,9 @@
         finally:
             self.item.execute = orig_exec 
 
-def getexecutor(item, config):
+def getexecutor(item):
     cls = RunExecutor 
-    if config.option.boxed: 
+    if item._config.option.boxed: 
         cls = ForkExecutor 
-    return cls(item, config)
+    return cls(item)
 

Modified: py/branch/event/py/test2/item.py
==============================================================================
--- py/branch/event/py/test2/item.py	(original)
+++ py/branch/event/py/test2/item.py	Sat Jul 19 13:00:35 2008
@@ -49,7 +49,7 @@
             information about running the underlying test item. 
         """ 
         from py.__.test2.executor import getexecutor
-        executor = getexecutor(self, self._config)
+        executor = getexecutor(self)
         return executor.execute()
        
 class Function(FunctionMixin, Item): 

Modified: py/branch/event/py/test2/testing/test_executor.py
==============================================================================
--- py/branch/event/py/test2/testing/test_executor.py	(original)
+++ py/branch/event/py/test2/testing/test_executor.py	Sat Jul 19 13:00:35 2008
@@ -13,7 +13,7 @@
 
     def getexecutor(self, examplename):
         funcitem = self.getfunc(examplename) 
-        return self.Executor(funcitem, self.config)
+        return self.Executor(funcitem)
 
     def exrun(self, examplename):
         ex = self.getexecutor(examplename) 
@@ -74,7 +74,7 @@
 
     def getexecutor(self, examplename, Tracer=Tracer):
         funcitem = self.getfunc(examplename) 
-        return self.Executor(funcitem, self.config, tracer=Tracer())
+        return self.Executor(funcitem, tracer=Tracer())
 
     def test_apigen_executor_tracing_hook(self):
         tmpdir = py.test2.ensuretemp("apigen_executor")
@@ -100,13 +100,13 @@
         rootcol = config._getcollector(tmpdir)
         tracer = self.Tracer()
         item = rootcol._getitembynames("test_one.py/test_1")
-        ex = ApigenExecutor(item, config, tracer)
+        ex = ApigenExecutor(item, tracer)
         out1 = ex.execute()
         item = rootcol._getitembynames("test_one.py/TestX/()/test_one")
-        ex = ApigenExecutor(item, config, tracer)
+        ex = ApigenExecutor(item, tracer)
         out2 = ex.execute()
         item = rootcol._getitembynames("test_one.py/TestX/()/test_raise")
-        ex = ApigenExecutor(item, config, tracer)
+        ex = ApigenExecutor(item, tracer)
         out3 = ex.execute()
         assert tracer.starts == 3
         assert tracer.ends == 3