Michael Aquilina
5ec08d3081
Delete trailing whitespace
2015-10-03 16:42:15 +01:00
Michael Aquilina
61b8443723
Update docs with new skip marker
2015-10-03 16:42:14 +01:00
holger krekel
cb58eaa611
Merge remote-tracking branch 'upstream/master' into features
...
Conflicts:
_pytest/__init__.py
testing/test_recwarn.py
2015-09-29 15:56:41 +02:00
holger krekel
787c866191
hide some parts from generating latexpdf
2015-09-29 13:37:30 +02:00
holger krekel
95245b935c
- fix a flaky test on py35-xdist by calling
...
importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors
2015-09-29 13:10:59 +02:00
holger krekel
0c05ca1fd5
Merge branch 'master' into features
2015-09-26 10:03:42 +02:00
Ronny Pfannschmidt
842aa5746f
Merge pull request #1069 from nicoddemus/docs-contents-reorg
...
Reorganize "Contents" page
2015-09-26 09:18:42 +02:00
Ronny Pfannschmidt
c2c2451788
Merge pull request #1071 from nicoddemus/xml-xdist
...
Wrong xml report when used with pytest-xdist
2015-09-26 09:05:25 +02:00
Bruno Oliveira
b72c3310bc
Add note on docs about record_xml_property not working with xdist
2015-09-26 03:24:07 -03:00
Oleg Alexandrov
9d2d2d17af
Clarify documentation
...
Fix doc markup
2015-09-25 21:46:06 -07:00
Bruno Oliveira
b403395cdb
Reorganize "Contents" page
...
Change the organization in a more logical way to a newcomer
2015-09-26 01:09:50 -03:00
Florian Bruhin
448ec8b740
Mark sources correctly in parametrize.rst.
...
Sphinx didn't pick this up as monospace text.
2015-09-25 18:43:33 +02:00
Florian Bruhin
272f987b0c
Fix test_time in parametrize doc.
...
The source was indented with a mixture of tabs and spaces, causing syntax
errors when executed.
2015-09-25 18:42:06 +02:00
Florian Bruhin
0ebac22bb2
Regenerate fixture list doc with cache docstring.
2015-09-25 18:41:07 +02:00
Tim Staley
eb2caa554c
Docs: Fixtures page - clarify usage of module-level pytestmark.
...
It certainly wasn't clear to me that the variable assigned by
pytest.mark.usefixtures should also be called pytestmark,
so I was confused when::
foo = pytest.mark.usefixtures('fixture_bar')
wasn't behaving as expected; correct usage is of course::
pytestmark = pytest.mark.usefixtures('fixture_bar')
I assume this is by design, otherwise that's a separate issue, at
least current behaviour should be documented.
2015-09-25 14:57:08 +01:00
Ronny Pfannschmidt
c3588b545f
generate docs on python3.4
2015-09-22 16:52:35 +02:00
Ronny Pfannschmidt
5ff75a41ea
fix erroring doc example
2015-09-22 15:05:56 +02:00
Ronny Pfannschmidt
89badfec0c
update regendoc, substitutes PYTHON_PREFIX
2015-09-22 14:48:04 +02:00
Ronny Pfannschmidt
662d755974
fix documentation gegeneration, kill Makefile
2015-09-22 14:22:37 +02:00
Galaczi Endre
beaa8e55bd
Fixes #653 use deprecated_call as context_manager
2015-09-21 19:01:23 +01:00
Floris Bruynooghe
7c3be72ac7
Merge pull request #1042 from Bjwebb/issue411
...
Add __eq__ method to assertion comparison example
2015-09-21 14:57:59 +01:00
Ben Webb
622e64320a
Add __eq__ method to assertion comparison example
...
This makes the example make more sense, because now Foo(1) == Foo(1) is
true. Fixes #411
2015-09-21 14:23:26 +01:00
Russel Winder
714a97e452
Remove references to distutils as per Issue 766.
2015-09-21 12:00:48 +01:00
Ronny Pfannschmidt
1aca998f3f
Merge pull request #1012 from lukas-bednar/junitxml_plugin
...
junitxml: align custom properties with junit format
2015-09-18 16:01:22 +02:00
Lukas Bednar
02a2272cfe
junitxml: move custom properties to properties element
...
<testsuite>
<testcase>
<properties>
<property name="ABC" value="XYZ" />
<property name="DEF" value="ZYX" />
</properties>
</testcase>
</testsuite>
2015-09-17 15:56:41 +02:00
Michael Droettboom
16f90ffc92
Various Python 3.5 documentation mentions
2015-09-17 07:32:52 -04:00
Florian Bruhin
2575053697
Merge pull request #1015 from hpk42/cache-integration
...
refined pytest-cache integration
2015-09-16 21:46:46 +02:00
holger krekel
3841e99720
avoid oldstyle funcarg usage
2015-09-16 21:06:44 +02:00
holger krekel
79d22bf334
some more doc refinements
2015-09-16 20:44:41 +02:00
holger krekel
45065e4e2e
refine command line option naming and docs
2015-09-16 20:41:22 +02:00
holger krekel
9a90aaca96
improve and integrate docs
2015-09-16 17:15:31 +02:00
holger krekel
fdd23878ec
Merge latest changes from branch 'pytest-2.7'
...
Conflicts:
_pytest/__init__.py
doc/en/fixture.rst
setup.cfg
testing/test_runner.py
2015-09-16 09:26:55 +02:00
Ronny Pfannschmidt
c06ff2a992
update docs on the json usage of builtin cache
2015-09-13 19:55:44 +02:00
Ronny Pfannschmidt
3d843edc69
minor doc reference fixes
2015-09-13 19:55:44 +02:00
Ronny Pfannschmidt
e20216a1a8
merge the pytest-cache plugin into core
2015-09-13 19:55:44 +02:00
Evan Bender
6ffb659282
Document single-method usage
...
It is possible to run a single test method in a class, but the syntax is
not glaringly obvious and documentation would help people out.
2015-09-04 15:11:57 -04:00
Brianna Laugher
c493f263b6
Merge branch 'Elizaveta239-master' closes #908
2015-08-29 17:34:35 +10:00
Bruno Oliveira
87cb5bc5b7
Add note that using marks on fixtures is not supported
...
Fix #964
2015-08-27 20:11:18 -03:00
Bruno Oliveira
d988d2006f
Mention cookie-cutter in the docs and fix broken links to <extplugin>
2015-08-25 23:59:18 -03:00
elizabeth
e67d66a5d4
Merge branch 'pytest-dev'
...
# Conflicts:
# AUTHORS
2015-08-24 22:55:11 +03:00
Bruno Oliveira
70da93145d
Improve docs and using warning system for record_xml_property fixture
2015-08-23 11:56:27 -03:00
Bruno Oliveira
a20c6d072d
Fix getdoctarget to ignore comment lines
2015-08-23 11:20:34 -03:00
David Diaz
44d9365da0
Add warning of "preliminary feature" to record_xml_property
2015-08-21 15:21:12 -06:00
David Diaz
2ddbac1f98
Correcting implementation based on pull request feed back
2015-08-21 14:31:53 -06:00
David Diaz
24212fd97f
Add support to record custom properties on xml output
2015-08-20 17:55:38 -06:00
Bruno Oliveira
93aee0f814
Add docs and CHANGELOG for ALLOW_UNICODE option
2015-08-12 22:17:15 -03:00
Christian Theune
2174f3ce37
Fix accidental inversion in skip example.
2015-08-12 07:38:04 +02:00
Bruno Oliveira
d49fb8a2d5
Change cx_freeze example to not use regendoc
2015-08-08 19:17:50 -03:00
Bruno Oliveira
e8583f01a0
Replaced __multicall__ examples in docs by hookwrapper
...
Fix #929
2015-08-08 19:07:27 -03:00
Abhijeet Kasurde
6d446e7167
Converted documentation from txt to rst
2015-08-05 10:24:14 +05:30