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
023687d8d0
Merge pull request #872 from nicoddemus/confcutdir-inifile
...
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default
2015-07-25 14:03:24 +02:00
9f94e443ff
Merge remote-tracking branch 'upstream/pytest-2.7'
...
Conflicts:
testing/conftest.py
2015-07-24 19:24:21 -03:00
91e8e59cea
Merge pull request #860 from nicoddemus/warn-plugins-as-str-main
...
Make passing plugins as str objects a more obvious failure
2015-07-24 19:13:39 -03:00
d104487282
importorskip: Allow non-integer version strings
...
Use `pkg_resources.parse_version` to parse version strings.
This can handle 'dev', 'rc', alpha and beta version strings,
among others.
2015-07-24 12:34:06 -04:00
35bbcc39a2
Interpret strings to "plugins" arg in pytest.main() as module names
...
See #855
2015-07-23 23:37:09 -03:00
ab9e246ab0
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default
...
As discussed in #82
2015-07-23 23:21:07 -03:00
df29120abe
Merge branch 'pytest-2.7'
...
Conflicts:
_pytest/config.py
_pytest/genscript.py
_pytest/mark.py
tox.ini
2015-07-23 22:35:51 -03:00
ce96973ed5
Merge pull request #864 from pytest-dev/consider-color-yes-everywhere
...
Consider --color option in more places which deal with TerminalWriters
2015-07-23 08:03:52 -03:00
77844ec5f3
Fixed typo in CHANGELOG: "testdirs" -> "testpaths"
2015-07-22 12:14:49 -03:00
0e26de2218
Merge pull request #867 from nicoddemus/autouse-yield-fixture-class
...
Fix autouse fixtures defined in a TestCase subclass
2015-07-22 01:25:21 +02:00
31cfbac1f4
Fix autouse fixtures defined in a TestCase subclass
2015-07-20 19:28:54 -03:00
6af7172204
Merge branch 'pytest-2.7'
2015-07-19 15:25:04 +02:00
953916df49
Report correct reason when using multiple skip/xfail markers
2015-07-18 18:18:45 -03:00
2f7d0f8bd9
Consider --color option in more places which deal with TerminalWriters
2015-07-18 16:39:55 -03:00
b18e6439bd
Ast Call signature changed on 3.5
...
fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/
Conflicts:
CHANGELOG
2015-07-18 13:15:46 -03:00
5e0235946b
Merge pull request #801 from Carreau/test-35
...
Support Python 3.5
2015-07-18 11:30:36 +01:00
330de0a93d
Use a subdirectory in the TEMP directory to speed up tmpdir creation
...
Fix #105
2015-07-16 19:50:49 -03:00
aa25fb05a9
Make sure marks in subclasses don't change marks in superclasses
...
Fix #842
2015-07-16 19:29:16 -03:00
Ronny Pfannschmidt
Bruno Oliveira
Brianna Laugher
elizabeth
David Diaz
Markus Unterwaditzer
TomV
Florian Bruhin
Abhijeet Kasurde
Eric Hunsberger
Floris Bruynooghe
Jan Bednařík
Christian Pommranz
Anatoly Bubenkov
Matthias Bussonnier