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

show pytest.__version__ not pylib

This commit is contained in:
holger krekel 2010-10-31 18:57:44 +01:00
parent 35969e13ae
commit 03924d205d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pytest/plugin/helpconfig.py
View File

@ -28,7 +28,7 @@ def pytest_cmdline_main(config):
if config.option.version: if config.option.version:
p = py.path.local(pytest.__file__).dirpath() p = py.path.local(pytest.__file__).dirpath()
sys.stderr.write("This is py.test version %s, imported from %s\n" % sys.stderr.write("This is py.test version %s, imported from %s\n" %
(py.__version__, p)) (pytest.__version__, p))
return 0 return 0
elif config.option.help: elif config.option.help:
config.pluginmanager.do_configure(config) config.pluginmanager.do_configure(config)

5
testing/plugin/test_helpconfig.py
View File

@ -1,13 +1,12 @@
import py, os import py, pytest,os
from pytest.plugin.helpconfig import collectattr from pytest.plugin.helpconfig import collectattr
def test_version(testdir): def test_version(testdir):
assert py.version == py.__version__
result = testdir.runpytest("--version") result = testdir.runpytest("--version")
assert result.ret == 0 assert result.ret == 0
#p = py.path.local(py.__file__).dirpath() #p = py.path.local(py.__file__).dirpath()
result.stderr.fnmatch_lines([ result.stderr.fnmatch_lines([
'*py.test*%s*imported from*' % (py.version, ) '*py.test*%s*imported from*' % (pytest.__version__, )
]) ])
def test_help(testdir): def test_help(testdir):