Skip to content

Commit

Permalink
CR fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
palaviv committed Jun 16, 2016
1 parent 8ddbca3 commit e6ff01a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
* Add ``build/`` and ``dist/`` to the default ``--norecursedirs`` list. Thanks
`@mikofski`_ for the report and `@tomviner`_ for the PR (`#1544`_).

* pytest.raises accepts a custom message to raise when no exception accord.
Thanks `@palaviv`_ for the PR.
* pytest.raises accepts a custom message to raise when no exception occurred.
Thanks `@palaviv`_ for the complete PR (`#1616`_).

.. _@milliams: https://github.com/milliams
.. _@csaftoiu: https://github.com/csaftoiu
Expand All @@ -92,6 +92,7 @@
.. _#1520: https://github.com/pytest-dev/pytest/pull/1520
.. _#372: https://github.com/pytest-dev/pytest/issues/372
.. _#1544: https://github.com/pytest-dev/pytest/issues/1544
.. _#1616: https://github.com/pytest-dev/pytest/pull/1616


**Bug Fixes**
Expand Down
4 changes: 2 additions & 2 deletions testing/python/raises.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def test_no_raise_message(self):
with pytest.raises(ValueError):
pass
except pytest.raises.Exception as e:
e.msg == "DID NOT RAISE {0}".format(repr(ValueError))
assert e.msg == "DID NOT RAISE {0}".format(repr(ValueError))

def test_costum_raise_message(self):
message = "TEST_MESSAGE"
Expand All @@ -92,4 +92,4 @@ def test_costum_raise_message(self):
with pytest.raises(ValueError, message=message):
pass
except pytest.raises.Exception as e:
e.msg == message
assert e.msg == message

0 comments on commit e6ff01a

Please sign in to comment.