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

fix deprecation warnings 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-01-17 10:54:36 +01:00
parent 09671eb6fc
commit f5e9d91f7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/example/assertion/test_failures.py
View File

@ -1,6 +1,6 @@
import py import py
failure_demo = py.magic.autopath().dirpath('failure_demo.py') failure_demo = py.path.local(__file__).dirpath('failure_demo.py')
pytest_plugins = "pytest_pytester" pytest_plugins = "pytest_pytester"

4
doc/example/funcarg/test_multi_python.py
View File

@ -11,7 +11,7 @@ pythonlist = ['python2.3', 'python2.4', 'python2.5', 'python2.6']
def pytest_generate_tests(metafunc): def pytest_generate_tests(metafunc):
if 'python1' in metafunc.funcargnames: if 'python1' in metafunc.funcargnames:
assert 'python2' in metafunc.funcargnames assert 'python2' in metafunc.funcargnames
for obj in metafunc.function.multiarg.obj: for obj in metafunc.function.multiarg.kwargs['obj']:
for py1 in pythonlist: for py1 in pythonlist:
for py2 in pythonlist: for py2 in pythonlist:
metafunc.addcall(id="%s-%s-%s" % (py1, py2, obj), metafunc.addcall(id="%s-%s-%s" % (py1, py2, obj),
@ -61,5 +61,5 @@ class Python:
if not res: if not res:
raise SystemExit(1) raise SystemExit(1)
""" % (str(self.picklefile), expression))) """ % (str(self.picklefile), expression)))
print loadfile print (loadfile)
py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) py.process.cmdexec("%s %s" %(self.pythonpath, loadfile))