Skip to content

Commit b920f09

Browse files
RonnyPfannschmidtRonnyPfannschmidt
committed
doc regen for release 2.8.4
1 parent a3353c4 commit b920f09

17 files changed

+79
-79
lines changed

‎doc/en/assert.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ you will see the return value of the function call::
2626

2727
$ py.test test_assert1.py
2828
======= test session starts ========
29-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
29+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
3030
rootdir: $REGENDOC_TMPDIR, inifile:
3131
collected 1 items
3232
@@ -146,7 +146,7 @@ if you run this module::
146146

147147
$ py.test test_assert2.py
148148
======= test session starts ========
149-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
149+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
150150
rootdir: $REGENDOC_TMPDIR, inifile:
151151
collected 1 items
152152

‎doc/en/builtin.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,4 @@ You can ask for available builtin or project-custom
131131
directory. The returned object is a `py.path.local`_
132132
path object.
133133
134-
in 0.12 seconds
134+
no tests ran in 0.12 seconds

‎doc/en/cache.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ If you then run it with ``--lf``::
8080

8181
$ py.test --lf
8282
======= test session starts ========
83-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
83+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
8484
run-last-failure: rerun last 2 failures
8585
rootdir: $REGENDOC_TMPDIR, inifile:
8686
collected 50 items
@@ -121,7 +121,7 @@ of ``FF`` and dots)::
121121

122122
$ py.test --ff
123123
======= test session starts ========
124-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
124+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
125125
run-last-failure: rerun last 2 failures first
126126
rootdir: $REGENDOC_TMPDIR, inifile:
127127
collected 50 items
@@ -226,7 +226,7 @@ You can always peek at the content of the cache using the
226226

227227
$ py.test --cache-clear
228228
======= test session starts ========
229-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
229+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
230230
rootdir: $REGENDOC_TMPDIR, inifile:
231231
collected 1 items
232232

‎doc/en/capture.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ of the failing function and hide the other one::
6464

6565
$ py.test
6666
======= test session starts ========
67-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
67+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
6868
rootdir: $REGENDOC_TMPDIR, inifile:
6969
collected 2 items
7070

‎doc/en/doctest.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ then you can just invoke ``py.test`` without command line options::
4646

4747
$ py.test
4848
======= test session starts ========
49-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
49+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
5050
rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
5151
collected 1 items
5252

‎doc/en/example/markers.rst

+14-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You can then restrict a test run to only run tests marked with ``webtest``::
3131

3232
$ py.test -v -m webtest
3333
======= test session starts ========
34-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
34+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
3535
cachedir: .cache
3636
rootdir: $REGENDOC_TMPDIR, inifile:
3737
collecting ... collected 4 items
@@ -45,7 +45,7 @@ Or the inverse, running all tests except the webtest ones::
4545

4646
$ py.test -v -m "not webtest"
4747
======= test session starts ========
48-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
48+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
4949
cachedir: .cache
5050
rootdir: $REGENDOC_TMPDIR, inifile:
5151
collecting ... collected 4 items
@@ -66,7 +66,7 @@ tests based on their module, class, method, or function name::
6666

6767
$ py.test -v test_server.py::TestClass::test_method
6868
======= test session starts ========
69-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
69+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
7070
cachedir: .cache
7171
rootdir: $REGENDOC_TMPDIR, inifile:
7272
collecting ... collected 5 items
@@ -79,7 +79,7 @@ You can also select on the class::
7979

8080
$ py.test -v test_server.py::TestClass
8181
======= test session starts ========
82-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
82+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
8383
cachedir: .cache
8484
rootdir: $REGENDOC_TMPDIR, inifile:
8585
collecting ... collected 4 items
@@ -92,7 +92,7 @@ Or select multiple nodes::
9292

9393
$ py.test -v test_server.py::TestClass test_server.py::test_send_http
9494
======= test session starts ========
95-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
95+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
9696
cachedir: .cache
9797
rootdir: $REGENDOC_TMPDIR, inifile:
9898
collecting ... collected 8 items
@@ -130,7 +130,7 @@ select tests based on their names::
130130

131131
$ py.test -v -k http # running with the above defined example module
132132
======= test session starts ========
133-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
133+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
134134
cachedir: .cache
135135
rootdir: $REGENDOC_TMPDIR, inifile:
136136
collecting ... collected 4 items
@@ -144,7 +144,7 @@ And you can also run all tests except the ones that match the keyword::
144144

145145
$ py.test -k "not send_http" -v
146146
======= test session starts ========
147-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
147+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
148148
cachedir: .cache
149149
rootdir: $REGENDOC_TMPDIR, inifile:
150150
collecting ... collected 4 items
@@ -160,7 +160,7 @@ Or to select "http" and "quick" tests::
160160

161161
$ py.test -k "http or quick" -v
162162
======= test session starts ========
163-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
163+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
164164
cachedir: .cache
165165
rootdir: $REGENDOC_TMPDIR, inifile:
166166
collecting ... collected 4 items
@@ -350,7 +350,7 @@ the test needs::
350350

351351
$ py.test -E stage2
352352
======= test session starts ========
353-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
353+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
354354
rootdir: $REGENDOC_TMPDIR, inifile:
355355
collected 1 items
356356
@@ -362,7 +362,7 @@ and here is one that specifies exactly the environment needed::
362362

363363
$ py.test -E stage1
364364
======= test session starts ========
365-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
365+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
366366
rootdir: $REGENDOC_TMPDIR, inifile:
367367
collected 1 items
368368
@@ -481,7 +481,7 @@ then you will see two test skipped and two executed tests as expected::
481481

482482
$ py.test -rs # this option reports skip reasons
483483
======= test session starts ========
484-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
484+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
485485
rootdir: $REGENDOC_TMPDIR, inifile:
486486
collected 4 items
487487
@@ -495,7 +495,7 @@ Note that if you specify a platform via the marker-command line option like this
495495

496496
$ py.test -m linux2
497497
======= test session starts ========
498-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
498+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
499499
rootdir: $REGENDOC_TMPDIR, inifile:
500500
collected 4 items
501501
@@ -547,7 +547,7 @@ We can now use the ``-m option`` to select one set::
547547

548548
$ py.test -m interface --tb=short
549549
======= test session starts ========
550-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
550+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
551551
rootdir: $REGENDOC_TMPDIR, inifile:
552552
collected 4 items
553553
@@ -569,7 +569,7 @@ or to select both "event" and "interface" tests::
569569

570570
$ py.test -m "interface or event" --tb=short
571571
======= test session starts ========
572-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
572+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
573573
rootdir: $REGENDOC_TMPDIR, inifile:
574574
collected 4 items
575575

‎doc/en/example/nonpython.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ now execute the test specification::
2727

2828
nonpython $ py.test test_simple.yml
2929
======= test session starts ========
30-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
30+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
3131
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
3232
collected 2 items
3333
34-
test_simple.yml F.
34+
test_simple.yml .F
3535
3636
======= FAILURES ========
3737
_______ usecase: hello ________
@@ -59,13 +59,13 @@ consulted when reporting in ``verbose`` mode::
5959

6060
nonpython $ py.test -v
6161
======= test session starts ========
62-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
62+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1 -- $PYTHON_PREFIX/bin/python3.4
6363
cachedir: .cache
6464
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
6565
collecting ... collected 2 items
6666
67-
test_simple.yml::hello FAILED
6867
test_simple.yml::ok PASSED
68+
test_simple.yml::hello FAILED
6969
7070
======= FAILURES ========
7171
_______ usecase: hello ________
@@ -81,11 +81,11 @@ interesting to just look at the collection tree::
8181

8282
nonpython $ py.test --collect-only
8383
======= test session starts ========
84-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
84+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
8585
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
8686
collected 2 items
8787
<YamlFile 'test_simple.yml'>
88-
<YamlItem 'hello'>
8988
<YamlItem 'ok'>
89+
<YamlItem 'hello'>
9090
91-
======= in 0.12 seconds ========
91+
======= no tests ran in 0.12 seconds ========

‎doc/en/example/parametrize.rst

+11-11
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ objects, they are still using the default pytest representation::
130130

131131
$ py.test test_time.py --collect-only
132132
======= test session starts ========
133-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
133+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
134134
rootdir: $REGENDOC_TMPDIR, inifile:
135135
collected 6 items
136136
<Module 'test_time.py'>
@@ -141,7 +141,7 @@ objects, they are still using the default pytest representation::
141141
<Function 'test_timedistance_v2[20011212-20011211-expected0]'>
142142
<Function 'test_timedistance_v2[20011211-20011212-expected1]'>
143143
144-
======= in 0.12 seconds ========
144+
======= no tests ran in 0.12 seconds ========
145145

146146
A quick port of "testscenarios"
147147
------------------------------------
@@ -181,7 +181,7 @@ this is a fully self-contained example which you can run with::
181181

182182
$ py.test test_scenarios.py
183183
======= test session starts ========
184-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
184+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
185185
rootdir: $REGENDOC_TMPDIR, inifile:
186186
collected 4 items
187187
@@ -194,7 +194,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
194194

195195
$ py.test --collect-only test_scenarios.py
196196
======= test session starts ========
197-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
197+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
198198
rootdir: $REGENDOC_TMPDIR, inifile:
199199
collected 4 items
200200
<Module 'test_scenarios.py'>
@@ -205,7 +205,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
205205
<Function 'test_demo1[advanced]'>
206206
<Function 'test_demo2[advanced]'>
207207
208-
======= in 0.12 seconds ========
208+
======= no tests ran in 0.12 seconds ========
209209

210210
Note that we told ``metafunc.parametrize()`` that your scenario values
211211
should be considered class-scoped. With pytest-2.3 this leads to a
@@ -259,14 +259,14 @@ Let's first see how it looks like at collection time::
259259

260260
$ py.test test_backends.py --collect-only
261261
======= test session starts ========
262-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
262+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
263263
rootdir: $REGENDOC_TMPDIR, inifile:
264264
collected 2 items
265265
<Module 'test_backends.py'>
266266
<Function 'test_db_initialized[d1]'>
267267
<Function 'test_db_initialized[d2]'>
268268
269-
======= in 0.12 seconds ========
269+
======= no tests ran in 0.12 seconds ========
270270

271271
And then when we run the test::
272272

@@ -320,13 +320,13 @@ The result of this test will be successful::
320320

321321
$ py.test test_indirect_list.py --collect-only
322322
======= test session starts ========
323-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
323+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
324324
rootdir: $REGENDOC_TMPDIR, inifile:
325325
collected 1 items
326326
<Module 'test_indirect_list.py'>
327327
<Function 'test_indirect[a-b]'>
328328
329-
======= in 0.12 seconds ========
329+
======= no tests ran in 0.12 seconds ========
330330

331331
.. regendoc:wipe
332332
@@ -399,8 +399,8 @@ Running it results in some skips if we don't have all the python interpreters in
399399
. $ py.test -rs -q multipython.py
400400
ssssssssssss...ssssssssssss
401401
======= short test summary info ========
402-
SKIP [12] $REGENDOC_TMPDIR/CWD/multipython.py:22: 'python3.3' not found
403402
SKIP [12] $REGENDOC_TMPDIR/CWD/multipython.py:22: 'python2.6' not found
403+
SKIP [12] $REGENDOC_TMPDIR/CWD/multipython.py:22: 'python3.3' not found
404404
3 passed, 24 skipped in 0.12 seconds
405405

406406
Indirect parametrization of optional implementations/imports
@@ -448,7 +448,7 @@ If you run this with reporting for skips enabled::
448448

449449
$ py.test -rs test_module.py
450450
======= test session starts ========
451-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
451+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
452452
rootdir: $REGENDOC_TMPDIR, inifile:
453453
collected 2 items
454454

‎doc/en/example/pythoncollection.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ then the test collection looks like this::
8282

8383
$ py.test --collect-only
8484
======= test session starts ========
85-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
85+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
8686
rootdir: $REGENDOC_TMPDIR, inifile: setup.cfg
8787
collected 2 items
8888
<Module 'check_myapp.py'>
@@ -91,7 +91,7 @@ then the test collection looks like this::
9191
<Function 'simple_check'>
9292
<Function 'complex_check'>
9393
94-
======= in 0.12 seconds ========
94+
======= no tests ran in 0.12 seconds ========
9595

9696
.. note::
9797

@@ -128,7 +128,7 @@ You can always peek at the collection tree without running tests like this::
128128

129129
. $ py.test --collect-only pythoncollection.py
130130
======= test session starts ========
131-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
131+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
132132
rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
133133
collected 3 items
134134
<Module 'CWD/pythoncollection.py'>
@@ -138,7 +138,7 @@ You can always peek at the collection tree without running tests like this::
138138
<Function 'test_method'>
139139
<Function 'test_anothermethod'>
140140
141-
======= in 0.12 seconds ========
141+
======= no tests ran in 0.12 seconds ========
142142

143143
customizing test collection to find all .py files
144144
---------------------------------------------------------
@@ -182,11 +182,11 @@ interpreters and will leave out the setup.py file::
182182

183183
$ py.test --collect-only
184184
======= test session starts ========
185-
platform linux -- Python 3.4.3, pytest-2.8.3, py-1.4.30, pluggy-0.3.1
185+
platform linux -- Python 3.4.3, pytest-2.8.4, py-1.4.30, pluggy-0.3.1
186186
rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
187187
collected 0 items
188188
189-
======= in 0.12 seconds ========
189+
======= no tests ran in 0.12 seconds ========
190190

191191
If you run with a Python3 interpreter the moduled added through the conftest.py file will not be considered for test collection.
192192

0 commit comments

Comments
 (0)