From 449b88c6407f3da139f2b02a3263ac5166af312e Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Fri, 20 Jan 2017 18:17:27 +0100 Subject: [PATCH] rerun regendoc with correct install --- doc/en/example/nonpython.rst | 48 ++++++++++++++++---------------- doc/en/example/parametrize.rst | 2 +- doc/en/example/reportingdemo.rst | 2 +- doc/en/getting-started.rst | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/en/example/nonpython.rst b/doc/en/example/nonpython.rst index 09daa3808..6510c861c 100644 --- a/doc/en/example/nonpython.rst +++ b/doc/en/example/nonpython.rst @@ -29,15 +29,16 @@ now execute the test specification:: ======= test session starts ======== platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0 rootdir: $REGENDOC_TMPDIR/nonpython, inifile: - collected 0 items / 1 errors + collected 2 items - ======= ERRORS ======== - _______ ERROR collecting test_simple.yml ________ - conftest.py:11: in collect - import yaml # we need a yaml parser, e.g. PyYAML - E ImportError: No module named 'yaml' - !!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!! - ======= 1 error in 0.12 seconds ======== + test_simple.yml F. + + ======= FAILURES ======== + _______ usecase: hello ________ + usecase execution failed + spec failed: 'some': 'other' + no further details known at this point. + ======= 1 failed, 1 passed in 0.12 seconds ======== .. regendoc:wipe @@ -61,15 +62,17 @@ consulted when reporting in ``verbose`` mode:: platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0 -- $PYTHON_PREFIX/bin/python3.5m cachedir: .cache rootdir: $REGENDOC_TMPDIR/nonpython, inifile: - collecting ... collected 0 items / 1 errors + collecting ... collected 2 items - ======= ERRORS ======== - _______ ERROR collecting test_simple.yml ________ - conftest.py:11: in collect - import yaml # we need a yaml parser, e.g. PyYAML - E ImportError: No module named 'yaml' - !!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!! - ======= 1 error in 0.12 seconds ======== + test_simple.yml::hello FAILED + test_simple.yml::ok PASSED + + ======= FAILURES ======== + _______ usecase: hello ________ + usecase execution failed + spec failed: 'some': 'other' + no further details known at this point. + ======= 1 failed, 1 passed in 0.12 seconds ======== .. regendoc:wipe @@ -80,12 +83,9 @@ interesting to just look at the collection tree:: ======= test session starts ======== platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0 rootdir: $REGENDOC_TMPDIR/nonpython, inifile: - collected 0 items / 1 errors + collected 2 items + + + - ======= ERRORS ======== - _______ ERROR collecting test_simple.yml ________ - conftest.py:11: in collect - import yaml # we need a yaml parser, e.g. PyYAML - E ImportError: No module named 'yaml' - !!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!! - ======= 1 error in 0.12 seconds ======== + ======= no tests ran in 0.12 seconds ======== diff --git a/doc/en/example/parametrize.rst b/doc/en/example/parametrize.rst index cd1b05b86..609158590 100644 --- a/doc/en/example/parametrize.rst +++ b/doc/en/example/parametrize.rst @@ -399,8 +399,8 @@ Running it results in some skips if we don't have all the python interpreters in . $ pytest -rs -q multipython.py sssssssssssssssssssssssssssssssssssssssssssss... ======= short test summary info ======== - SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python3.4' not found SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python2.6' not found + SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python3.4' not found SKIP [15] $REGENDOC_TMPDIR/CWD/multipython.py:23: 'python2.7' not found 3 passed, 45 skipped in 0.12 seconds diff --git a/doc/en/example/reportingdemo.rst b/doc/en/example/reportingdemo.rst index c586bc250..141208321 100644 --- a/doc/en/example/reportingdemo.rst +++ b/doc/en/example/reportingdemo.rst @@ -359,7 +359,7 @@ get on the terminal - we are working on that):: > int(s) E ValueError: invalid literal for int() with base 10: 'qwe' - <0-codegen /home/ronny/Projects/pytest-dev/pytest/_pytest/python.py:1207>:1: ValueError + <0-codegen $PYTHON_PREFIX/lib/python3.5/site-packages/_pytest/python.py:1207>:1: ValueError _______ TestRaises.test_raises_doesnt ________ self = diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst index f19f4d0c0..557e8245d 100644 --- a/doc/en/getting-started.rst +++ b/doc/en/getting-started.rst @@ -26,7 +26,7 @@ Installation:: To check your installation has installed the correct version:: $ pytest --version - This is pytest version 3.0.6, imported from /home/ronny/Projects/pytest-dev/pytest/pytest.py + This is pytest version 3.0.6, imported from $PYTHON_PREFIX/lib/python3.5/site-packages/pytest.py .. _`simpletest`: