Skip to content

Commit 7dd3173

Browse files
rerun regendoc with correct install
1 parent 7bc4fd6 commit 7dd3173

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

doc/en/example/nonpython.rst

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ now execute the test specification::
2929
======= test session starts ========
3030
platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0
3131
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
32-
collected 0 items / 1 errors
32+
collected 2 items
3333
34-
======= ERRORS ========
35-
_______ ERROR collecting test_simple.yml ________
36-
conftest.py:11: in collect
37-
import yaml # we need a yaml parser, e.g. PyYAML
38-
E ImportError: No module named 'yaml'
39-
!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!
40-
======= 1 error in 0.12 seconds ========
34+
test_simple.yml F.
35+
36+
======= FAILURES ========
37+
_______ usecase: hello ________
38+
usecase execution failed
39+
spec failed: 'some': 'other'
40+
no further details known at this point.
41+
======= 1 failed, 1 passed in 0.12 seconds ========
4142

4243
.. regendoc:wipe
4344
@@ -61,15 +62,17 @@ consulted when reporting in ``verbose`` mode::
6162
platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0 -- $PYTHON_PREFIX/bin/python3.5m
6263
cachedir: .cache
6364
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
64-
collecting ... collected 0 items / 1 errors
65+
collecting ... collected 2 items
66+
67+
test_simple.yml::hello FAILED
68+
test_simple.yml::ok PASSED
6569
66-
======= ERRORS ========
67-
_______ ERROR collecting test_simple.yml ________
68-
conftest.py:11: in collect
69-
import yaml # we need a yaml parser, e.g. PyYAML
70-
E ImportError: No module named 'yaml'
71-
!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!
72-
======= 1 error in 0.12 seconds ========
70+
======= FAILURES ========
71+
_______ usecase: hello ________
72+
usecase execution failed
73+
spec failed: 'some': 'other'
74+
no further details known at this point.
75+
======= 1 failed, 1 passed in 0.12 seconds ========
7376

7477
.. regendoc:wipe
7578
@@ -80,12 +83,9 @@ interesting to just look at the collection tree::
8083
======= test session starts ========
8184
platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0
8285
rootdir: $REGENDOC_TMPDIR/nonpython, inifile:
83-
collected 0 items / 1 errors
86+
collected 2 items
87+
<YamlFile 'test_simple.yml'>
88+
<YamlItem 'hello'>
89+
<YamlItem 'ok'>
8490
85-
======= ERRORS ========
86-
_______ ERROR collecting test_simple.yml ________
87-
conftest.py:11: in collect
88-
import yaml # we need a yaml parser, e.g. PyYAML
89-
E ImportError: No module named 'yaml'
90-
!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!
91-
======= 1 error in 0.12 seconds ========
91+
======= no tests ran in 0.12 seconds ========

doc/en/example/parametrize.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ Running it results in some skips if we don't have all the python interpreters in
399399
. $ pytest -rs -q multipython.py
400400
sssssssssssssssssssssssssssssssssssssssssssss...
401401
======= short test summary info ========
402-
SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python3.4' not found
403402
SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python2.6' not found
403+
SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python3.4' not found
404404
SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python2.7' not found
405405
3 passed, 45 skipped in 0.12 seconds
406406

doc/en/example/reportingdemo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ get on the terminal - we are working on that)::
359359
> int(s)
360360
E ValueError: invalid literal for int() with base 10: 'qwe'
361361
362-
<0-codegen /home/ronny/Projects/pytest-dev/pytest/_pytest/python.py:1207>:1: ValueError
362+
<0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python.py:1207>:1: ValueError
363363
_______ TestRaises.test_raises_doesnt ________
364364
365365
self = <failure_demo.TestRaises object at 0xdeadbeef>

doc/en/getting-started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Installation::
2626
To check your installation has installed the correct version::
2727

2828
$ pytest --version
29-
This is pytest version 3.0.6, imported from /home/ronny/Projects/pytest-dev/pytest/pytest.py
29+
This is pytest version 3.0.6, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py
3030

3131
.. _`simpletest`:
3232

0 commit comments

Comments
 (0)