7c088d1104
remove nonsense line
2015-09-22 11:23:24 +02:00
48df2f6842
Merge branch 'master' into features
2015-09-22 11:23:05 +02:00
bf9b94595c
fix changelog
2015-09-22 11:18:19 +02:00
41d61ed221
Merge pull request #1023 from RonnyPfannschmidt/fix-877
...
Fix 877
2015-09-22 11:17:02 +02:00
79587d4b70
Merge branch 'master' into features
...
Conflicts:
_pytest/__init__.py
2015-09-22 11:06:21 +02:00
8a4517fd17
re-add 2.8.x changelog so that MASTER can be merged into features wrt
...
to the changelog
2015-09-22 11:05:19 +02:00
d8fbb0b8e3
start features branch
2015-09-22 11:00:55 +02:00
e2f72ffed8
start bugfix changelog on master
2015-09-22 10:59:23 +02:00
a5ff345f7b
fix another occurence of "macro" to "major"
2015-09-22 10:45:55 +02:00
745cd26850
Merge branch 'master' into newbranching
2015-09-22 10:22:05 +02:00
71c5883d52
update according to discussion on pytest-dev and in PR
2015-09-22 10:21:01 +02:00
c30eafa254
Update changelog for merged PR.
2015-09-21 14:59:48 +01:00
65de43e67d
Mention fix for issue 766 in changelog
...
Fixes issue #766 .
2015-09-21 12:21:24 +01:00
49c99a41ea
reencode non-ascii python2 assertion reprs, fixes #877
...
i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so
2015-09-19 00:30:01 +02:00
f02d9425f9
Bump version to 2.8.0
2015-09-18 19:04:20 -03:00
baf5b5d005
update changelog/author info, bump version number
2015-09-17 13:43:39 +02:00
a62d12634c
revert importing test module behaviour to prepend by default
2015-09-16 22:12:20 +02:00
9a90aaca96
improve and integrate docs
2015-09-16 17:15:31 +02:00
c06ff2a992
update docs on the json usage of builtin cache
2015-09-13 19:55:44 +02:00
e20216a1a8
merge the pytest-cache plugin into core
2015-09-13 19:55:44 +02:00
c7888d1d97
Add note in changelog about issue 960
2015-09-12 11:17:50 -03:00
348e519437
Merge pull request #962 from nicoddemus/doctest-skip
...
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
2015-09-01 12:31:35 +02:00
7292212d5a
Merge pull request #976 from nicoddemus/ren-warnings-on-terminal
...
Rename "warnings" to "pytest-warnings" in terminal output
2015-09-01 07:56:42 +02:00
4ad56e84a8
Make doctest SKIP option register doctests as SKIPPED rather than PASSED
...
Fix 957
2015-08-31 21:25:11 -03:00
e3734ef337
Add CHANGELOG entry about renaming "warnings" to "pytest-warnings"
2015-08-31 21:21:29 -03:00
c493f263b6
Merge branch 'Elizaveta239-master' closes #908
2015-08-29 17:34:35 +10:00
dd7112d5ea
Show a few diff lines when truncating string diffs
...
Fix #934
2015-08-27 22:20:13 -03:00
b49bedcf0c
Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master
2015-08-28 11:10:22 +10:00
42b43a7d7b
Paths after normal options are now properly used to discover rootdir and ini files
...
Fix #949
2015-08-25 22:08:05 -03:00
e67d66a5d4
Merge branch 'pytest-dev'
...
# Conflicts:
# AUTHORS
2015-08-24 22:55:11 +03:00
b25e41e348
Merge pull request #956 from nicoddemus/record-xml-property
...
add preliminary support for extended junit xml properties
2015-08-24 09:13:04 +02:00
70da93145d
Improve docs and using warning system for record_xml_property fixture
2015-08-23 11:56:27 -03:00
2ddbac1f98
Correcting implementation based on pull request feed back
2015-08-21 14:31:53 -06:00
2ffd37b816
return non-zero exit code if no tests are collected
...
Fix #812
Fix #500
2015-08-18 07:35:02 -03:00
93aee0f814
Add docs and CHANGELOG for ALLOW_UNICODE option
2015-08-12 22:17:15 -03:00
cafd71eb29
Update changelog for #926
...
Also fix some inconsistencies in the changelog on the way.
2015-08-11 00:47:18 +02:00
14625907ae
update changelog
2015-08-09 00:11:16 +01:00
40fa7b25c5
Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master
...
Fixed merge conflict in CHANGELOG
2015-08-08 18:54:53 +02:00
03d8a6c05d
Update CHANGELOG.
2015-08-07 23:08:22 +02:00
91a29932a6
Add CHANGELOG entry.
2015-08-07 07:58:13 +02:00
4f83586f55
Give credit where it is due in CHANGELOG 😄
...
Related to #890
2015-08-06 22:51:32 -03:00
ab9befb197
Updated CHANGELOG and AUTHORS
2015-08-05 15:21:37 +05:30
54a3d6210b
Update CHANGELOG and AUTHORS
2015-08-02 20:39:31 +03:00
52b4eb6c46
Added `warns` to assert warnings are thrown
...
Works in a similar manner to `raises`, but for warnings instead
of exceptions. Also refactored `recwarn.py` so that all the
warning recording and checking use the same core code.
2015-07-30 23:28:32 -04:00
e69e785b23
Mention fix for issue #683
2015-07-26 12:15:29 +02:00
011565ca10
Add changelog entry for capture improvement
2015-07-26 11:42:33 +02:00
f64d5f1209
Merge pull request #884 from cpommranz/deprecate_genscript
...
Deprecate and warn about --genscript, fixes #730
2015-07-25 19:09:52 +02:00
251fc68ef9
Merge fix for #751
...
Merge branch 'fix-751' of github.com:JanBednarik/pytest into jb-fix-751
2015-07-25 19:03:44 +02:00
0b92650494
Update changelog.
2015-07-25 16:25:29 +02:00
00e1a2122a
Deprecate and warn about --genscript, fixes #730
2015-07-25 15:10:22 +02:00
holger krekel
holger krekel
Floris Bruynooghe
Ronny Pfannschmidt
Bruno Oliveira
Brianna Laugher
elizabeth
David Diaz
Markus Unterwaditzer
TomV
Florian Bruhin
Abhijeet Kasurde
Eric Hunsberger
Jan Bednařík
Christian Pommranz