floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addresses issue15 

expose fillfuncargs as py.test.collect._fillfuncargs instead for now

--HG--
branch : trunk
This commit is contained in:
Samuele Pedroni 2009-05-21 19:36:02 +02:00
parent e79f4d298c
commit f50b39980c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/__init__.py
View File

@ -79,7 +79,6 @@ initpkg(__name__,
'test.fail' : ('./test/outcome.py', 'fail'), 'test.fail' : ('./test/outcome.py', 'fail'),
'test.exit' : ('./test/outcome.py', 'exit'), 'test.exit' : ('./test/outcome.py', 'exit'),
'test.pdb' : ('./test/custompdb.py', 'set_trace'), 'test.pdb' : ('./test/custompdb.py', 'set_trace'),
'test.fillfuncargs' : ('./test/funcargs.py', 'fillfuncargs'),
# configuration/initialization related test api # configuration/initialization related test api
'test.config' : ('./test/config.py', 'config_per_process'), 'test.config' : ('./test/config.py', 'config_per_process'),
@ -96,6 +95,7 @@ initpkg(__name__,
'test.collect.Instance' : ('./test/pycollect.py', 'Instance'), 'test.collect.Instance' : ('./test/pycollect.py', 'Instance'),
'test.collect.Generator' : ('./test/pycollect.py', 'Generator'), 'test.collect.Generator' : ('./test/pycollect.py', 'Generator'),
'test.collect.Function' : ('./test/pycollect.py', 'Function'), 'test.collect.Function' : ('./test/pycollect.py', 'Function'),
'test.collect._fillfuncargs' : ('./test/funcargs.py', 'fillfuncargs'),
# thread related API (still in early design phase) # thread related API (still in early design phase)
'_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'), '_thread.WorkerPool' : ('./thread/pool.py', 'WorkerPool'),

2
py/test/testing/test_funcargs.py
View File

@ -87,7 +87,7 @@ class TestFillFuncArgs:
item.config.pluginmanager.register(Provider()) item.config.pluginmanager.register(Provider())
if hasattr(item, '_args'): if hasattr(item, '_args'):
del item._args del item._args
py.test.fillfuncargs(item) py.test.collect._fillfuncargs(item)
assert len(item.funcargs) == 1 assert len(item.funcargs) == 1
class TestRequest: class TestRequest: