[py-svn] r62168 - in py/branch/pytestplugin/py/test: dsession/testing plugin

[hpk at codespeak.net]

Author: hpk
Date: Wed Feb 25 23:23:37 2009
New Revision: 62168

Modified:
   py/branch/pytestplugin/py/test/dsession/testing/test_functional_dsession.py
   py/branch/pytestplugin/py/test/plugin/pytest_pytester.py
Log:
avoiding _reparse() mostly


Modified: py/branch/pytestplugin/py/test/dsession/testing/test_functional_dsession.py
==============================================================================
--- py/branch/pytestplugin/py/test/dsession/testing/test_functional_dsession.py	(original)
+++ py/branch/pytestplugin/py/test/dsession/testing/test_functional_dsession.py	Wed Feb 25 23:23:37 2009
@@ -21,19 +21,19 @@
             import py
             Option = py.test.config.Option 
             option = py.test.config.addoptions("someopt", 
-                Option('', '--forcegen', action="store_true", dest="forcegen", default=False))
+                Option('--someopt', action="store_true", dest="someopt", default=False))
         """, 
         )
         p1 = testdir.makepyfile("""
             def test_1(): 
                 import py, conftest
-                print "test_1: py.test.config.option.forcegen", py.test.config.option.forcegen
+                print "test_1: py.test.config.option.someopt", py.test.config.option.someopt
                 print "test_1: conftest", conftest
-                print "test_1: conftest.option.forcegen", conftest.option.forcegen
-                assert conftest.option.forcegen 
+                print "test_1: conftest.option.someopt", conftest.option.someopt
+                assert conftest.option.someopt 
         """, __init__="#")
         print p1
-        config = testdir.parseconfig('-n1', p1, '--forcegen')
+        config = py.test.config._reparse(['-n1', p1, '--someopt'])
         dsession = DSession(config)
         eq = EventQueue(config.bus)
         dsession.main()

Modified: py/branch/pytestplugin/py/test/plugin/pytest_pytester.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_pytester.py	(original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_pytester.py	Wed Feb 25 23:23:37 2009
@@ -103,7 +103,7 @@
 
     def inline_genitems(self, *args):
         #config = self.parseconfig(*args)
-        config = self.parseconfig_clean(*args)
+        config = self.parseconfig(*args)
         session = config.initsession()
         rec = EventRecorder(config.bus)
         colitems = [config.getfsnode(arg) for arg in config.args]
@@ -141,7 +141,7 @@
         return sorter
 
     def inline_run_with_plugins(self, *args):
-        config = self.parseconfig_clean(*args)
+        config = self.parseconfig(*args)
         config.pytestplugins.configure(config)
         session = config.initsession()
         sorter = EventRecorder(config.bus)
@@ -158,19 +158,13 @@
                 config.pytestplugins.register(plugin)
         return config
 
-    def parseconfig_clean(self, *args):
+    def parseconfig(self, *args):
         if not args:
             args = (self.tmpdir,)
         config = self.config_preparse()
         config.parse(list(args))
         return config 
 
-    # XXX deprecated:
-    def parseconfig(self, *args):
-        if not args:
-            args = (self.tmpdir,)
-        return py.test.config._reparse(list(args))
-
     def getitem(self,  source, funcname="test_func"):
         modcol = self.getmodulecol(source)
         item = modcol.join(funcname)