3348: raise error on unknown arguments to raises

_pytest/python_api.py

@@ -597,6 +597,10 @@ def raises(expected_exception, *args, **kwargs):
  message = kwargs.pop("message")
  if "match" in kwargs:
  match_expr = kwargs.pop("match")
+ if kwargs:
+ msg = 'Unexpected keyword arguments passed to pytest.raises: '
+ msg += ', '.join(kwargs.keys())
+ raise TypeError(msg)
  return RaisesContext(expected_exception, message, match_expr)
  elif isinstance(args[0], str):
  code, = args

changelog/3348.bugfix.rst

@@ -0,0 +1 @@
+``pytest.raises`` now raises ``TypeError`` when receiving an unknown keyword argument.

testing/python/raises.py

@@ -61,6 +61,11 @@ def test_noclass(self):
  with pytest.raises(TypeError):
  pytest.raises('wrong', lambda: None)
 
+ def test_invalid_arguments_to_raises(self):
+ with pytest.raises(TypeError, match='unknown'):
+ with pytest.raises(TypeError, unknown='bogus'):
+ raise ValueError()
+
  def test_tuple(self):
  with pytest.raises((KeyError, ValueError)):
  raise KeyError('oops')

testing/test_recwarn.py

@@ -113,7 +113,7 @@ def f():
  pass
 
  msg = 'Did not produce DeprecationWarning or PendingDeprecationWarning'
- with pytest.raises(AssertionError, matches=msg):
+ with pytest.raises(AssertionError, match=msg):
  if mode == 'call':
  pytest.deprecated_call(f)
  else: