Commit Graph

49 Commits

Author SHA1 Message Date
Bruno Oliveira afe847ecdc fixture docs: highlight difference between yield and addfinalizer methods
Fix #2508
2017-06-20 23:43:34 -03:00
Ronny Pfannschmidt 03753ca201 intermediate state after attempt with the plain env, DONT MERGE 2017-05-13 13:25:52 +02:00
Ronny Pfannschmidt d1e44d16e7 regenerate docs from the pytest env 2017-05-12 22:51:20 +02:00
Ronny Pfannschmidt f1c4e2c032 regendoc: reduce version noise by replacing minor/patch with placeholders 2017-05-12 22:17:40 +02:00
Bruno Oliveira f3b359f5b8 Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py
2017-05-03 19:04:53 -03:00
Krzysztof Szularz f0533194ed Update fixture.rst
Remove yet another not needed `request` argument in fixture definition.
2017-04-26 10:31:53 +02:00
Krzysztof Szularz a9b44c4529 Update docs
Remove not needed `request` arg in order to simplify the example.
2017-04-25 16:35:19 +02:00
Bruno Oliveira 6c9011c12f Merge branch 'master' into merge-master-into-features-post-3.0.7 2017-03-14 18:10:23 -03:00
Bruno Oliveira d58780f9a6 Update regendoc 2017-03-13 18:41:20 -04:00
Bruno Oliveira 1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features
# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py
2017-03-10 15:54:05 -03:00
Bruno Oliveira bb5f200ed7 Improve docs for yield-fixture and with statement a bit
Fix #2262
2017-02-25 12:06:51 -03:00
Michal Wajszczuk fb0b90646e New-style classes implemented for python 2.7 - #2147 2017-02-16 20:28:17 +01:00
Ronny Pfannschmidt 4d0c635252 regendoc 2017-01-22 18:44:30 +01:00
Peter Heatwole ef903460b1 Fix broken links 2017-01-02 14:19:49 -08:00
Luke Murphy f94189b48b Fix wrong fixture name. Closes #2143. 2016-12-20 01:48:32 +01:00
Oscar Hellström f42a954cb3 Also update yield teardown for Issue #687 2016-12-07 15:08:38 +01:00
Bruno Oliveira f592c7746a Regendocs for 3.0.5 2016-12-05 07:22:06 -05:00
Duncan Betts 6473c3d87e Improved description of functionality for Issue #687 2016-11-28 14:30:25 +00:00
Bruno Oliveira ab274299fe Regen doc for 3.0.4 2016-11-09 16:44:58 -05:00
Grigorii Eremeev 65ebc75ee8 Update fixture.rst
Removed redundant word
2016-10-05 22:26:13 +03:00
Bruno Oliveira 41d3b3f4f9 Regendoc for version 3.0.3 2016-09-28 16:36:15 -04:00
Bruno Oliveira d512e7f26b Run regendoc for 3.0.2 release 2016-08-31 20:32:05 -04:00
Bruno Oliveira 49fc4e5e4c Changes for 3.0.1 release 2016-08-23 18:15:43 -04:00
Bruno Oliveira 707b6b5e3f Revert all invocation-fixtures code
Due to a serious regression found in #1794, it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1
2016-08-17 08:12:55 -03:00
Bruno Oliveira 946466abf4 Run regen-docs for pytest 3.0 2016-08-01 20:09:35 -04:00
Bruno Oliveira 29289b472f Add documentation for "invocation" scoped fixture 2016-07-09 16:51:25 -03:00
Ronny Pfannschmidt b9a91dc112 merge from master to features 2016-07-06 11:51:48 +02:00
Brandon W Maister 771c4539fa Document the interaction of autouse scopes
I wouldn't have even attempted what I did to cause #1688 if this had
been there.
2016-06-29 16:52:13 -04:00
Dave Hunt ef9dd14963 Introduce pytest command as recommended entry point
Fixes #1629
2016-06-21 16:16:57 +02:00
Bruno Oliveira fe4f23c1bf Update docs in prol of using yield statements 2016-06-08 21:07:52 -03:00
Ronny Pfannschmidt 77c28825df regendoc and comment out a python2.7 example as per #1573 2016-05-31 19:05:36 +02:00
Omar Kohl f70ed83479 Fix 'test grouping by fixture instances' doc example
The fin() function was never added as a finalizer and did therefore not print
anything in the captured output.

In general improve the output by making it more verbose/explicit and extend the
final explanation.
2016-03-20 15:53:32 +01:00
Omar Kohl dff914cadd Add short explanation and link to yield fixtures in fixture doc 2016-03-20 14:10:20 +01:00
Omar Kohl 3135463573 No longer refer to the 'yield fixture mechanism' as experimental (doc)
The feature has been there for a long time and in the 2.7.1 release notes it
says:

> fixed docs to remove the notion that yield-fixtures are experimental.

Therefore this one place was probably just missed.
2016-03-20 13:54:56 +01:00
nicoddemus 168daaa71f Regendocs 2016-03-17 17:13:41 -04:00
nicoddemus f82c03833f Regendocs 2016-02-29 15:52:56 -05:00
Ronny Pfannschmidt 64d7d00218 Prepare 2.8.7 release 2016-01-24 17:59:48 +01:00
Florian Bruhin 7d150c20cf Regenerate 2.8.5 docs. 2015-12-11 22:28:23 -02:00
Ronny Pfannschmidt b920f09a95 doc regen for release 2.8.4 2015-12-06 16:14:23 +01:00
Ronny Pfannschmidt 063f90f0d2 run regendoc 2015-11-18 17:47:17 +01:00
Florian Bruhin 42937d4bb6 Prepare 2.8.2 release. 2015-10-06 21:06:25 +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
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
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
Abhijeet Kasurde e79413acc4 Updated documentation from txt to rst
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-08-04 16:41:02 +05:30