jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix py32 failures and remove random print from commit accident

This commit is contained in:
holger krekel 2013-12-16 07:19:49 +01:00
parent 86c56c829a
commit c9195a0f45
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_pytest/python.py
View File

@ -1623,7 +1623,6 @@ class FixtureManager:
return fixturenames_closure, arg2fixturedefs return fixturenames_closure, arg2fixturedefs
def pytest_generate_tests(self, metafunc): def pytest_generate_tests(self, metafunc):
print "pytest core pytest_generate_tests"
for argname in metafunc.fixturenames: for argname in metafunc.fixturenames:
faclist = metafunc._arg2fixturedefs.get(argname) faclist = metafunc._arg2fixturedefs.get(argname)
if faclist is None: if faclist is None:

3
testing/test_genscript.py
View File

@ -22,7 +22,8 @@ class Standalone:
def test_gen(testdir, anypython, standalone): def test_gen(testdir, anypython, standalone):
if sys.version_info >= (2,7): if sys.version_info >= (2,7):
result = testdir._run(anypython, "-c", result = testdir._run(anypython, "-c",
"import sys;print sys.version_info >=(2,7)") "import sys;print (sys.version_info >=(2,7))")
assert result.ret == 0
if result.stdout.str() == "False": if result.stdout.str() == "False":
pytest.skip("genscript called from python2.7 cannot work " pytest.skip("genscript called from python2.7 cannot work "
"earlier python versions") "earlier python versions")