From f50b39980cb934b670c5f5e288bc87cb3c7cde05 Mon Sep 17 00:00:00 2001 From: Samuele Pedroni Date: Thu, 21 May 2009 19:36:02 +0200 Subject: [PATCH] addresses issue15 expose fillfuncargs as py.test.collect._fillfuncargs instead for now --HG-- branch : trunk --- py/__init__.py | 2 +- py/test/testing/test_funcargs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/py/__init__.py b/py/__init__.py index 555a3f014..0406b2023 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -79,7 +79,6 @@ 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'), @@ -96,6 +95,7 @@ initpkg(__name__, 'test.collect.Instance' : ('./test/pycollect.py', 'Instance'), 'test.collect.Generator' : ('./test/pycollect.py', 'Generator'), 'test.collect.Function' : ('./test/pycollect.py', 'Function'), + 'test.collect._fillfuncargs' : ('./test/funcargs.py', 'fillfuncargs'), # thread related API (still in early design phase) '_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'), diff --git a/py/test/testing/test_funcargs.py b/py/test/testing/test_funcargs.py index 2c0446429..bb7e832ae 100644 --- a/py/test/testing/test_funcargs.py +++ b/py/test/testing/test_funcargs.py @@ -87,7 +87,7 @@ class TestFillFuncArgs: item.config.pluginmanager.register(Provider()) if hasattr(item, '_args'): del item._args - py.test.fillfuncargs(item) + py.test.collect._fillfuncargs(item) assert len(item.funcargs) == 1 class TestRequest: