`deprecated_call` detects pending warnings again
`deprecated_call` now looks for PendingDeprecationWarnings, as it did previously but was broken by #897. Fixes #1037. Also added a test so this does not happen again.
This commit is contained in:
parent
22e1f4946e
commit
e8261e0c77
|
@ -36,7 +36,8 @@ def deprecated_call(func, *args, **kwargs):
|
||||||
warnings.simplefilter('always') # ensure all warnings are triggered
|
warnings.simplefilter('always') # ensure all warnings are triggered
|
||||||
ret = func(*args, **kwargs)
|
ret = func(*args, **kwargs)
|
||||||
|
|
||||||
if not any(r.category is DeprecationWarning for r in wrec):
|
depwarnings = (DeprecationWarning, PendingDeprecationWarning)
|
||||||
|
if not any(r.category in depwarnings for r in wrec):
|
||||||
__tracebackhide__ = True
|
__tracebackhide__ = True
|
||||||
raise AssertionError("%r did not produce DeprecationWarning" % (func,))
|
raise AssertionError("%r did not produce DeprecationWarning" % (func,))
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ def dep_explicit(i):
|
||||||
class TestDeprecatedCall(object):
|
class TestDeprecatedCall(object):
|
||||||
def test_deprecated_call_raises(self):
|
def test_deprecated_call_raises(self):
|
||||||
excinfo = pytest.raises(AssertionError,
|
excinfo = pytest.raises(AssertionError,
|
||||||
"pytest.deprecated_call(dep, 3)")
|
"pytest.deprecated_call(dep, 3)")
|
||||||
assert str(excinfo).find("did not produce") != -1
|
assert str(excinfo).find("did not produce") != -1
|
||||||
|
|
||||||
def test_deprecated_call(self):
|
def test_deprecated_call(self):
|
||||||
|
@ -105,12 +105,16 @@ class TestDeprecatedCall(object):
|
||||||
|
|
||||||
def test_deprecated_explicit_call_raises(self):
|
def test_deprecated_explicit_call_raises(self):
|
||||||
pytest.raises(AssertionError,
|
pytest.raises(AssertionError,
|
||||||
"pytest.deprecated_call(dep_explicit, 3)")
|
"pytest.deprecated_call(dep_explicit, 3)")
|
||||||
|
|
||||||
def test_deprecated_explicit_call(self):
|
def test_deprecated_explicit_call(self):
|
||||||
pytest.deprecated_call(dep_explicit, 0)
|
pytest.deprecated_call(dep_explicit, 0)
|
||||||
pytest.deprecated_call(dep_explicit, 0)
|
pytest.deprecated_call(dep_explicit, 0)
|
||||||
|
|
||||||
|
def test_deprecated_call_pending(self):
|
||||||
|
f = lambda: py.std.warnings.warn(PendingDeprecationWarning("hi"))
|
||||||
|
pytest.deprecated_call(f)
|
||||||
|
|
||||||
|
|
||||||
class TestWarns(object):
|
class TestWarns(object):
|
||||||
def test_strings(self):
|
def test_strings(self):
|
||||||
|
@ -181,4 +185,3 @@ class TestWarns(object):
|
||||||
''')
|
''')
|
||||||
result = testdir.runpytest()
|
result = testdir.runpytest()
|
||||||
result.stdout.fnmatch_lines(['*2 passed in*'])
|
result.stdout.fnmatch_lines(['*2 passed in*'])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue