minimal changes to expose fillfuncargs

--HG--
branch : trunk

py/__init__.py

@@ -79,6 +79,7 @@ initpkg(__name__,
     'test.fail'              : ('./test/outcome.py', 'fail'),
     'test.exit'              : ('./test/outcome.py', 'exit'),
     'test.pdb'               : ('./test/custompdb.py', 'set_trace'),
+    'test.fillfuncargs'      : ('./test/funcargs.py', 'fillfuncargs'),
 
     # configuration/initialization related test api
     'test.config'            : ('./test/config.py', 'config_per_process'),

py/test/funcargs.py

@@ -95,7 +95,7 @@ class FuncargRequest:
     def _fillfuncargs(self):
         argnames = getfuncargnames(self.function)
         if argnames:
-            assert not self._pyfuncitem._args, "yielded functions cannot have funcargs" 
+            assert not getattr(self._pyfuncitem, '_args', None), "yielded functions cannot have funcargs" 
         for argname in argnames:
             if argname not in self._pyfuncitem.funcargs:
                 self._pyfuncitem.funcargs[argname] = self.getfuncargvalue(argname)

py/test/testing/test_funcargs.py

@@ -79,6 +79,17 @@ class TestFillFuncArgs:
             "*1 passed*"
         ])
 
+    def test_fillfuncargs_exposed(self, testdir):
+        item = testdir.getitem("def test_func(some, other=42): pass")
+        class Provider:
+            def pytest_funcarg__some(self, request):
+                return request.function.__name__
+        item.config.pluginmanager.register(Provider())
+        if hasattr(item, '_args'):
+            del item._args
+        py.test.fillfuncargs(item)
+        assert len(item.funcargs) == 1
+
 class TestRequest:
     def test_request_attributes(self, testdir):
         item = testdir.getitem("""