p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup changelog 

This seems to have gone wrong in the merge.
This commit is contained in:
Floris Bruynooghe 2013-11-21 01:37:48 +00:00
parent a467fbea0d
commit d67514b657
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -4,6 +4,7 @@ Unreleased
- fix issue287 by running all finalizers but saving the exception - fix issue287 by running all finalizers but saving the exception
from the last failing finalizer and re-raising it so teardown will from the last failing finalizer and re-raising it so teardown will
still have failed. still have failed.
- fix ordering when mock.patch or other standard decorator-wrappings - fix ordering when mock.patch or other standard decorator-wrappings
are used with test methods. This fixues issue346. Thanks to are used with test methods. This fixues issue346. Thanks to
Ronny Pfannschmidt and Donald Stufft for helping to isolate it. Ronny Pfannschmidt and Donald Stufft for helping to isolate it.
@ -59,6 +60,9 @@ Unreleased
although it's not needed by pytest itself atm. Also although it's not needed by pytest itself atm. Also
fix caching. Fixes issue376. fix caching. Fixes issue376.
- fix issue221 - handle importing of namespace-package with no
__init__.py properly.
Changes between 2.4.1 and 2.4.2 Changes between 2.4.1 and 2.4.2
----------------------------------- -----------------------------------