Merged in flub/pytest (pull request #207)

Show both user assertion msg as explanation (issue549)
2014-09-22 19:16:10 +02:00
parent e2c6a77f06 7760cf1881
commit 79d2edcbff
7 changed files with 281 additions and 13 deletions
--- a/4
+++ b/4
@@ -42,6 +42,10 @@ NEXT
  other builds due to the extra argparse dependency.  Fixes issue566.
  Thanks sontek.

+- Implement issue549: user-provided assertion messages now no longer
+  replace the py.test instrospection message but are shown in addition
+  to them.
+
 2.6.1
 -----------------------------------