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

Merge pull request #881 from maartenq/master 

setuptools not present issue deprecating gentest
This commit is contained in:
Floris Bruynooghe 2015-07-25 15:03:50 +02:00
parent 023687d8d0 e3d60024aa
commit 80ee620459
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/standalonetemplate.py
View File

@ -68,6 +68,11 @@ class DictImporter(object):
return res return res
if __name__ == "__main__": if __name__ == "__main__":
try:
import pkg_resources # noqa
except ImportError:
sys.stderr.write("ERROR: setuptools not installed\n")
sys.exit(2)
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
exec("def do_exec(co, loc): exec(co, loc)\n") exec("def do_exec(co, loc): exec(co, loc)\n")
import pickle import pickle
@ -80,6 +85,5 @@ if __name__ == "__main__":
importer = DictImporter(sources) importer = DictImporter(sources)
sys.meta_path.insert(0, importer) sys.meta_path.insert(0, importer)
entry = "@ENTRY@" entry = "@ENTRY@"
do_exec(entry, locals()) # noqa do_exec(entry, locals()) # noqa

6
testing/test_genscript.py
View File

@ -27,13 +27,17 @@ def test_gen(testdir, anypython, standalone):
pytest.skip("genscript called from python2.7 cannot work " pytest.skip("genscript called from python2.7 cannot work "
"earlier python versions") "earlier python versions")
result = standalone.run(anypython, testdir, '--version') result = standalone.run(anypython, testdir, '--version')
assert result.ret == 0 if result.ret == 2:
result.stderr.fnmatch_lines(["*ERROR: setuptools not installed*"])
elif result.ret == 0:
result.stderr.fnmatch_lines([ result.stderr.fnmatch_lines([
"*imported from*mypytest*" "*imported from*mypytest*"
]) ])
p = testdir.makepyfile("def test_func(): assert 0") p = testdir.makepyfile("def test_func(): assert 0")
result = standalone.run(anypython, testdir, p) result = standalone.run(anypython, testdir, p)
assert result.ret != 0 assert result.ret != 0
else:
pytest.fail("Unexpected return code")
def test_freeze_includes(): def test_freeze_includes():