Merge master into features

2018-12-14 16:44:43 +01:00
parent ae5d5b8f59 b76104e722
commit 8e287c5c77
13 changed files with 72 additions and 11 deletions
--- a/src/_pytest/python_api.py
+++ b/src/_pytest/python_api.py
@@ -718,6 +718,6 @@ class RaisesContext(object):
        suppress_exception = issubclass(self.excinfo.type, self.expected_exception)
        if sys.version_info[0] == 2 and suppress_exception:
            sys.exc_clear()
-        if self.match_expr and suppress_exception:
+        if self.match_expr is not None and suppress_exception:
            self.excinfo.match(self.match_expr)
        return suppress_exception