# HG changeset patch -- Bitbucket.org
# Project pytest
# URL http://bitbucket.org/hpk42/pytest/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1291720704 -3600
# Node ID 031d0af75303e3bf6af99b1dcea784c113369083
# Parent d796239b64d87e078d33d4beda73ac8d4509abc5
make getvalueorskip() be hidden in skip-reporting. also bump version.
--- a/pytest.py
+++ b/pytest.py
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.1.dev3'
+__version__ = '2.0.1.dev4'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def main():
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.0.1.dev3',
+ version='2.0.1.dev4',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -399,7 +399,9 @@ class Config(object):
return self._getconftest(name, path, check=False)
def getvalueorskip(self, name, path=None):
- """ (deprecated) return getvalue(name) or call py.test.skip if no
value exists. """
+ """ (deprecated) return getvalue(name) or call
+ py.test.skip if no value exists. """
+ __tracebackhide__ = True
try:
val = self.getvalue(name, path)
if val is None:
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -111,8 +111,15 @@ class TestConfigAPI:
verbose = config.getvalueorskip("verbose")
assert verbose == config.option.verbose
config.option.hello = None
- pytest.raises(pytest.skip.Exception,
- "config.getvalueorskip('hello')")
+ try:
+ config.getvalueorskip('hello')
+ except KeyboardInterrupt:
+ raise
+ except:
+ excinfo = py.code.ExceptionInfo()
+ frame = excinfo.traceback[-2].frame
+ assert frame.code.name == "getvalueorskip"
+ assert frame.eval("__tracebackhide__")
def test_config_overwrite(self, testdir):
o = testdir.tmpdir
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
