From e0251ecb41b5b2677a00475c59063547c8c09bcf Mon Sep 17 00:00:00 2001 From: holger krekel Date: Fri, 24 Oct 2014 15:08:43 +0200 Subject: [PATCH] regen docs --HG-- branch : pytest-2.6 --- _pytest/__init__.py | 2 +- doc/en/assert.txt | 5 +- doc/en/capture.txt | 4 +- doc/en/conf.py | 2 +- doc/en/doctest.txt | 4 +- doc/en/example/markers.txt | 32 ++++---- doc/en/example/nonpython.txt | 12 +-- doc/en/example/parametrize.txt | 94 +++++++++++----------- doc/en/example/pythoncollection.txt | 8 +- doc/en/example/reportingdemo.txt | 117 +++++++++++++++------------- doc/en/example/simple.txt | 68 ++++++++-------- doc/en/example/special.txt | 2 +- doc/en/fixture.txt | 36 ++++----- doc/en/getting-started.txt | 12 +-- doc/en/index.txt | 5 -- doc/en/parametrize.txt | 12 +-- doc/en/skipping.txt | 4 +- doc/en/tmpdir.txt | 6 +- doc/en/unittest.txt | 8 +- setup.py | 2 +- 20 files changed, 218 insertions(+), 217 deletions(-) diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 41703c08b..c467b523f 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.6.4.dev2' +__version__ = '2.6.4' diff --git a/doc/en/assert.txt b/doc/en/assert.txt index 434f8ae97..9bc3ea929 100644 --- a/doc/en/assert.txt +++ b/doc/en/assert.txt @@ -26,7 +26,7 @@ you will see the return value of the function call:: $ py.test test_assert1.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_assert1.py F @@ -135,7 +135,7 @@ if you run this module:: $ py.test test_assert2.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_assert2.py F @@ -152,6 +152,7 @@ if you run this module:: E '1' E Extra items in the right set: E '5' + E Use -v to get the full diff test_assert2.py:5: AssertionError ========================= 1 failed in 0.01 seconds ========================= diff --git a/doc/en/capture.txt b/doc/en/capture.txt index 5e397e2f6..fc560bfb2 100644 --- a/doc/en/capture.txt +++ b/doc/en/capture.txt @@ -64,7 +64,7 @@ of the failing function and hide the other one:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_module.py .F @@ -78,7 +78,7 @@ of the failing function and hide the other one:: test_module.py:9: AssertionError -------------------------- Captured stdout setup --------------------------- - setting up + setting up ==================== 1 failed, 1 passed in 0.01 seconds ==================== Accessing captured output from a test function diff --git a/doc/en/conf.py b/doc/en/conf.py index d6ca4b3d5..40dd1c2f6 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -18,7 +18,7 @@ # The full version, including alpha/beta/rc tags. # The short X.Y version. version = "2.6" -release = "2.6.3" +release = "2.6.4" import sys, os diff --git a/doc/en/doctest.txt b/doc/en/doctest.txt index c612d9a23..35be61964 100644 --- a/doc/en/doctest.txt +++ b/doc/en/doctest.txt @@ -44,12 +44,12 @@ then you can just invoke ``py.test`` without command line options:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items mymodule.py . - ========================= 1 passed in 0.05 seconds ========================= + ========================= 1 passed in 0.06 seconds ========================= It is possible to use fixtures using the ``getfixture`` helper:: diff --git a/doc/en/example/markers.txt b/doc/en/example/markers.txt index bb8e08b49..d7324b229 100644 --- a/doc/en/example/markers.txt +++ b/doc/en/example/markers.txt @@ -31,7 +31,7 @@ You can then restrict a test run to only run tests marked with ``webtest``:: $ py.test -v -m webtest =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_send_http PASSED @@ -43,7 +43,7 @@ Or the inverse, running all tests except the webtest ones:: $ py.test -v -m "not webtest" =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_something_quick PASSED @@ -62,7 +62,7 @@ tests based on their module, class, method, or function name:: $ py.test -v test_server.py::TestClass::test_method =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 5 items test_server.py::TestClass::test_method PASSED @@ -73,7 +73,7 @@ You can also select on the class:: $ py.test -v test_server.py::TestClass =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::TestClass::test_method PASSED @@ -84,7 +84,7 @@ Or select multiple nodes:: $ py.test -v test_server.py::TestClass test_server.py::test_send_http =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 8 items test_server.py::TestClass::test_method PASSED @@ -120,7 +120,7 @@ select tests based on their names:: $ py.test -v -k http # running with the above defined example module =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_send_http PASSED @@ -132,7 +132,7 @@ And you can also run all tests except the ones that match the keyword:: $ py.test -k "not send_http" -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_something_quick PASSED @@ -140,13 +140,13 @@ And you can also run all tests except the ones that match the keyword:: test_server.py::TestClass::test_method PASSED ================= 1 tests deselected by '-knot send_http' ================== - ================== 3 passed, 1 deselected in 0.02 seconds ================== + ================== 3 passed, 1 deselected in 0.01 seconds ================== Or to select "http" and "quick" tests:: $ py.test -k "http or quick" -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_send_http PASSED @@ -326,7 +326,7 @@ the test needs:: $ py.test -E stage2 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_someenv.py s @@ -337,7 +337,7 @@ and here is one that specifies exactly the environment needed:: $ py.test -E stage1 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_someenv.py . @@ -455,12 +455,12 @@ then you will see two test skipped and two executed tests as expected:: $ py.test -rs # this option reports skip reasons =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_plat.py sss. ========================= short test summary info ========================== - SKIP [3] /tmp/doc-exec-224/conftest.py:12: cannot run on platform linux + SKIP [3] /tmp/doc-exec-68/conftest.py:12: cannot run on platform linux =================== 1 passed, 3 skipped in 0.01 seconds ==================== @@ -468,7 +468,7 @@ Note that if you specify a platform via the marker-command line option like this $ py.test -m linux2 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_plat.py s @@ -519,7 +519,7 @@ We can now use the ``-m option`` to select one set:: $ py.test -m interface --tb=short =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_module.py FF @@ -540,7 +540,7 @@ or to select both "event" and "interface" tests:: $ py.test -m "interface or event" --tb=short =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_module.py FFF diff --git a/doc/en/example/nonpython.txt b/doc/en/example/nonpython.txt index 0481b7e78..1f29d535a 100644 --- a/doc/en/example/nonpython.txt +++ b/doc/en/example/nonpython.txt @@ -27,10 +27,10 @@ now execute the test specification:: nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items - test_simple.yml .F + test_simple.yml F. ================================= FAILURES ================================= ______________________________ usecase: hello ______________________________ @@ -56,11 +56,11 @@ consulted when reporting in ``verbose`` mode:: nonpython $ py.test -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 2 items - test_simple.yml::usecase: ok PASSED test_simple.yml::usecase: hello FAILED + test_simple.yml::usecase: ok PASSED ================================= FAILURES ================================= ______________________________ usecase: hello ______________________________ @@ -74,10 +74,10 @@ interesting to just look at the collection tree:: nonpython $ py.test --collect-only =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items - + ============================= in 0.03 seconds ============================= diff --git a/doc/en/example/parametrize.txt b/doc/en/example/parametrize.txt index 5f790c40b..eaae09930 100644 --- a/doc/en/example/parametrize.txt +++ b/doc/en/example/parametrize.txt @@ -106,7 +106,7 @@ this is a fully self-contained example which you can run with:: $ py.test test_scenarios.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_scenarios.py .... @@ -118,7 +118,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia $ py.test --collect-only test_scenarios.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items @@ -182,7 +182,7 @@ Let's first see how it looks like at collection time:: $ py.test test_backends.py --collect-only =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items @@ -197,7 +197,7 @@ And then when we run the test:: ================================= FAILURES ================================= _________________________ test_db_initialized[d2] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -206,7 +206,7 @@ And then when we run the test:: E Failed: deliberately failing for demo purposes test_backends.py:6: Failed - 1 failed, 1 passed in 0.02 seconds + 1 failed, 1 passed in 0.01 seconds The first invocation with ``db == "DB1"`` passed while the second with ``db == "DB2"`` failed. Our ``db`` fixture function has instantiated each of the DB values during the setup phase while the ``pytest_generate_tests`` generated two according calls to the ``test_db_initialized`` during the collection phase. @@ -251,16 +251,16 @@ argument sets to use for each test function. Let's run it:: $ py.test -q F.. ================================= FAILURES ================================= - ________________________ TestClass.test_equals[1-2] ________________________ + ________________________ TestClass.test_equals[2-1] ________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 def test_equals(self, a, b): > assert a == b E assert 1 == 2 test_parametrize.py:18: AssertionError - 1 failed, 2 passed in 0.02 seconds + 1 failed, 2 passed in 0.01 seconds Indirect parametrization with multiple fixtures -------------------------------------------------------------- @@ -283,8 +283,8 @@ Running it results in some skips if we don't have all the python interpreters in ================================= FAILURES ================================= ________________ test_basic_objects[python3.4-python2.6-42] ________________ - python1 = - python2 = , obj = 42 + python1 = + python2 = , obj = 42 @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -297,7 +297,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p0/load.py' + cmd = '/home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p0/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -322,9 +322,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p0/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p0/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p0/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p0/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -336,11 +336,11 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p0/load.py + /tmp/pytest-111/test_basic_objects_python3_4_p0/load.py _______________ test_basic_objects[python3.4-python2.6-obj1] _______________ - python1 = - python2 = , obj = {} + python1 = + python2 = , obj = {} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -353,7 +353,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p1/load.py' + cmd = '/home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p1/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -378,9 +378,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p1/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p1/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p1/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p1/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -392,11 +392,11 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p1/load.py + /tmp/pytest-111/test_basic_objects_python3_4_p1/load.py _______________ test_basic_objects[python3.4-python2.6-obj2] _______________ - python1 = - python2 = , obj = {1: 3} + python1 = + python2 = , obj = {1: 3} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -409,7 +409,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p2/load.py' + cmd = '/home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p2/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -434,9 +434,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-21/test_basic_objects_python3_4_p2/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.6 /tmp/pytest-111/test_basic_objects_python3_4_p2/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p2/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p2/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -448,11 +448,11 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p2/load.py + /tmp/pytest-111/test_basic_objects_python3_4_p2/load.py ________________ test_basic_objects[python3.4-python2.7-42] ________________ - python1 = - python2 = , obj = 42 + python1 = + python2 = , obj = 42 @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -465,7 +465,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p3/load.py' + cmd = '/home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p3/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -490,9 +490,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p3/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p3/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p3/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p3/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -504,11 +504,11 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p3/load.py + /tmp/pytest-111/test_basic_objects_python3_4_p3/load.py _______________ test_basic_objects[python3.4-python2.7-obj1] _______________ - python1 = - python2 = , obj = {} + python1 = + python2 = , obj = {} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -521,7 +521,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p4/load.py' + cmd = '/home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p4/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -546,9 +546,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p4/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p4/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p4/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p4/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -560,11 +560,11 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p4/load.py + /tmp/pytest-111/test_basic_objects_python3_4_p4/load.py _______________ test_basic_objects[python3.4-python2.7-obj2] _______________ - python1 = - python2 = , obj = {1: 3} + python1 = + python2 = , obj = {1: 3} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -577,7 +577,7 @@ Running it results in some skips if we don't have all the python interpreters in py.process.cmdexec("%s %s" %(self.pythonpath, loadfile)) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - cmd = '/home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p5/load.py' + cmd = '/home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p5/load.py' def cmdexec(cmd): """ return unicode output of executing 'cmd' in a separate process. @@ -602,9 +602,9 @@ Running it results in some skips if we don't have all the python interpreters in status = process.poll() if status: > raise ExecutionFailed(status, status, cmd, out, err) - E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/bin/python2.7 /tmp/pytest-21/test_basic_objects_python3_4_p5/load.py + E py.process.cmdexec.Error: ExecutionFailed: 1 /home/hpk/venv/0/bin/python2.7 /tmp/pytest-111/test_basic_objects_python3_4_p5/load.py E Traceback (most recent call last): - E File "/tmp/pytest-21/test_basic_objects_python3_4_p5/load.py", line 4, in + E File "/tmp/pytest-111/test_basic_objects_python3_4_p5/load.py", line 4, in E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -616,8 +616,8 @@ Running it results in some skips if we don't have all the python interpreters in ../../../.tox/regen/lib/python3.4/site-packages/py/_process/cmdexec.py:28: Error --------------------------- Captured stdout call --------------------------- - /tmp/pytest-21/test_basic_objects_python3_4_p5/load.py - 6 failed, 21 passed in 1.36 seconds + /tmp/pytest-111/test_basic_objects_python3_4_p5/load.py + 6 failed, 21 passed in 1.66 seconds Indirect parametrization of optional implementations/imports -------------------------------------------------------------------- @@ -664,12 +664,12 @@ If you run this with reporting for skips enabled:: $ py.test -rs test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-226/conftest.py:10: could not import 'opt2' + SKIP [1] /tmp/doc-exec-70/conftest.py:10: could not import 'opt2' =================== 1 passed, 1 skipped in 0.01 seconds ==================== diff --git a/doc/en/example/pythoncollection.txt b/doc/en/example/pythoncollection.txt index e7226b3c2..b4857e120 100644 --- a/doc/en/example/pythoncollection.txt +++ b/doc/en/example/pythoncollection.txt @@ -43,7 +43,7 @@ then the test collection looks like this:: $ py.test --collect-only =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items @@ -88,7 +88,7 @@ You can always peek at the collection tree without running tests like this:: . $ py.test --collect-only pythoncollection.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 3 items @@ -141,10 +141,10 @@ interpreters and will leave out the setup.py file:: $ py.test --collect-only =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 0 items - ============================= in 0.01 seconds ============================= + ============================= in 0.00 seconds ============================= If you run with a Python3 interpreter the moduled added through the conftest.py file will not be considered for test collection. diff --git a/doc/en/example/reportingdemo.txt b/doc/en/example/reportingdemo.txt index 0f690e4a8..1779fd376 100644 --- a/doc/en/example/reportingdemo.txt +++ b/doc/en/example/reportingdemo.txt @@ -13,7 +13,7 @@ get on the terminal - we are working on that): assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 42 items failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -30,7 +30,7 @@ get on the terminal - we are working on that): failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = + self = def test_simple(self): def f(): @@ -40,13 +40,13 @@ get on the terminal - we are working on that): > assert f() == g() E assert 42 == 43 - E + where 42 = .f at 0x2adb9887e6a8>() - E + and 43 = .g at 0x2adb9887e598>() + E + where 42 = .f at 0x2b4436f1e6a8>() + E + and 43 = .g at 0x2b4436f1e7b8>() failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = + self = def test_simple_multiline(self): otherfunc_multi( @@ -66,19 +66,19 @@ get on the terminal - we are working on that): failure_demo.py:11: AssertionError ___________________________ TestFailing.test_not ___________________________ - self = + self = def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = .f at 0x2adb9887e840>() + E + where 42 = .f at 0x2b4436f1ebf8>() failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = + self = def test_eq_text(self): > assert 'spam' == 'eggs' @@ -89,7 +89,7 @@ get on the terminal - we are working on that): failure_demo.py:42: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ - self = + self = def test_eq_similar_text(self): > assert 'foo 1 bar' == 'foo 2 bar' @@ -102,7 +102,7 @@ get on the terminal - we are working on that): failure_demo.py:45: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ - self = + self = def test_eq_multiline_text(self): > assert 'foo\nspam\nbar' == 'foo\neggs\nbar' @@ -115,7 +115,7 @@ get on the terminal - we are working on that): failure_demo.py:48: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ - self = + self = def test_eq_long_text(self): a = '1'*100 + 'a' + '2'*100 @@ -132,7 +132,7 @@ get on the terminal - we are working on that): failure_demo.py:53: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ - self = + self = def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,17 +156,18 @@ get on the terminal - we are working on that): failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = + self = def test_eq_list(self): > assert [0, 1, 2] == [0, 1, 3] E assert [0, 1, 2] == [0, 1, 3] E At index 2 diff: 2 != 3 + E Use -v to get the full diff failure_demo.py:61: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ - self = + self = def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -174,11 +175,12 @@ get on the terminal - we are working on that): > assert a == b E assert [0, 0, 0, 0, 0, 0, ...] == [0, 0, 0, 0, 0, 0, ...] E At index 100 diff: 1 != 2 + E Use -v to get the full diff failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ - self = + self = def test_eq_dict(self): > assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0} @@ -190,11 +192,12 @@ get on the terminal - we are working on that): E {'c': 0} E Right contains more items: E {'d': 0} + E Use -v to get the full diff failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = + self = def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -206,21 +209,23 @@ get on the terminal - we are working on that): E Extra items in the right set: E 20 E 21 + E Use -v to get the full diff failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = + self = def test_eq_longer_list(self): > assert [1,2] == [1,2,3] E assert [1, 2] == [1, 2, 3] E Right contains more items, first extra item: 3 + E Use -v to get the full diff failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = + self = def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -229,7 +234,7 @@ get on the terminal - we are working on that): failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = + self = def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -247,7 +252,7 @@ get on the terminal - we are working on that): failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = + self = def test_not_in_text_single(self): text = 'single foo line' @@ -260,7 +265,7 @@ get on the terminal - we are working on that): failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = + self = def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -273,7 +278,7 @@ get on the terminal - we are working on that): failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = + self = def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -292,7 +297,7 @@ get on the terminal - we are working on that): i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = .Foo object at 0x2adb987b5470>.b + E + where 1 = .Foo object at 0x2b4436e42ac8>.b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -302,8 +307,8 @@ get on the terminal - we are working on that): b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = .Foo object at 0x2adb987d0390>.b - E + where .Foo object at 0x2adb987d0390> = .Foo'>() + E + where 1 = .Foo object at 0x2b4436f185c0>.b + E + where .Foo object at 0x2b4436f185c0> = .Foo'>() failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -319,7 +324,7 @@ get on the terminal - we are working on that): failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = .Foo object at 0x2adb98822cf8> + self = .Foo object at 0x2b4436f16a58> def _get_b(self): > raise Exception('Failed to get attrib') @@ -335,15 +340,15 @@ get on the terminal - we are working on that): b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = .Foo object at 0x2adb98841dd8>.b - E + where .Foo object at 0x2adb98841dd8> = .Foo'>() - E + and 2 = .Bar object at 0x2adb98841a90>.b - E + where .Bar object at 0x2adb98841a90> = .Bar'>() + E + where 1 = .Foo object at 0x2b4436f12a90>.b + E + where .Foo object at 0x2b4436f12a90> = .Foo'>() + E + and 2 = .Bar object at 0x2b4436f12ac8>.b + E + where .Bar object at 0x2b4436f12ac8> = .Bar'>() failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = + self = def test_raises(self): s = 'qwe' @@ -358,7 +363,7 @@ get on the terminal - we are working on that): <0-codegen /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/python.py:1028>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = + self = def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -367,7 +372,7 @@ get on the terminal - we are working on that): failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = + self = def test_raise(self): > raise ValueError("demo error") @@ -376,7 +381,7 @@ get on the terminal - we are working on that): failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = + self = def test_tupleerror(self): > a,b = [1] @@ -385,7 +390,7 @@ get on the terminal - we are working on that): failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = + self = def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -398,7 +403,7 @@ get on the terminal - we are working on that): l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = + self = def test_some_error(self): > if namenotexi: @@ -426,7 +431,7 @@ get on the terminal - we are working on that): <2-codegen 'abc-123' /home/hpk/p/pytest/doc/en/example/assertion/failure_demo.py:162>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ - self = + self = def test_complex_error(self): def f(): @@ -450,7 +455,7 @@ get on the terminal - we are working on that): failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = + self = def test_z1_unpack_error(self): l = [] @@ -460,7 +465,7 @@ get on the terminal - we are working on that): failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = + self = def test_z2_type_error(self): l = 3 @@ -470,19 +475,19 @@ get on the terminal - we are working on that): failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = + self = def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert ('456') - E + where = '123'.startswith + E assert ('456') + E + where = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = + self = def test_startswith_nested(self): def f(): @@ -490,15 +495,15 @@ get on the terminal - we are working on that): def g(): return "456" > assert f().startswith(g()) - E assert ('456') - E + where = '123'.startswith - E + where '123' = .f at 0x2adb9887e9d8>() - E + and '456' = .g at 0x2adb9887e7b8>() + E assert ('456') + E + where = '123'.startswith + E + where '123' = .f at 0x2b4436f1e950>() + E + and '456' = .g at 0x2b4436f1e840>() failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = + self = def test_global_func(self): > assert isinstance(globf(42), float) @@ -508,18 +513,18 @@ get on the terminal - we are working on that): failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = + self = def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = .x + E + where 42 = .x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = + self = def test_compare(self): > assert globf(10) < 5 @@ -529,7 +534,7 @@ get on the terminal - we are working on that): failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = + self = def test_try_finally(self): x = 1 @@ -540,7 +545,7 @@ get on the terminal - we are working on that): failure_demo.py:210: AssertionError ___________________ TestCustomAssertMsg.test_single_line ___________________ - self = + self = def test_single_line(self): class A: @@ -554,7 +559,7 @@ get on the terminal - we are working on that): failure_demo.py:221: AssertionError ____________________ TestCustomAssertMsg.test_multiline ____________________ - self = + self = def test_multiline(self): class A: @@ -571,7 +576,7 @@ get on the terminal - we are working on that): failure_demo.py:227: AssertionError ___________________ TestCustomAssertMsg.test_custom_repr ___________________ - self = + self = def test_custom_repr(self): class JSON: @@ -589,4 +594,4 @@ get on the terminal - we are working on that): E + where 1 = This is JSON\n{\n 'foo': 'bar'\n}.a failure_demo.py:237: AssertionError - ======================== 42 failed in 0.29 seconds ========================= + ======================== 42 failed in 0.23 seconds ========================= diff --git a/doc/en/example/simple.txt b/doc/en/example/simple.txt index ae193d914..8b23bafb4 100644 --- a/doc/en/example/simple.txt +++ b/doc/en/example/simple.txt @@ -55,7 +55,7 @@ Let's run this without supplying our new option:: test_sample.py:6: AssertionError --------------------------- Captured stdout call --------------------------- first - 1 failed in 0.02 seconds + 1 failed in 0.01 seconds And now with supplying a command line option:: @@ -108,9 +108,9 @@ directory with the above conftest.py:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 0 items - + ============================= in 0.00 seconds ============================= .. _`excontrolskip`: @@ -152,12 +152,12 @@ and when running it will see a skipped "slow" test:: $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-229/conftest.py:9: need --runslow option to run + SKIP [1] /tmp/doc-exec-73/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.01 seconds ==================== @@ -165,11 +165,11 @@ Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items - + test_module.py .. - + ========================= 2 passed in 0.01 seconds ========================= Writing well integrated assertion helpers @@ -256,10 +256,10 @@ which will add the string to the test header accordingly:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 project deps: mylib-1.1 collected 0 items - + ============================= in 0.00 seconds ============================= .. regendoc:wipe @@ -279,20 +279,20 @@ which will add info only when run with "--v":: $ py.test -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 info1: did you know that ... did you? collecting ... collected 0 items - + ============================= in 0.00 seconds ============================= and nothing when run plainly:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 0 items - + ============================= in 0.00 seconds ============================= profiling test duration @@ -322,7 +322,7 @@ Now we can profile which test functions execute the slowest:: $ py.test --durations=3 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 3 items test_some_are_slow.py ... @@ -330,8 +330,8 @@ Now we can profile which test functions execute the slowest:: ========================= slowest 3 test durations ========================= 0.20s call test_some_are_slow.py::test_funcslow2 0.10s call test_some_are_slow.py::test_funcslow1 - 0.00s teardown test_some_are_slow.py::test_funcslow1 - ========================= 3 passed in 0.32 seconds ========================= + 0.00s setup test_some_are_slow.py::test_funcslow2 + ========================= 3 passed in 0.31 seconds ========================= incremental testing - test steps --------------------------------------------------- @@ -383,7 +383,7 @@ If we run this:: $ py.test -rx =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 4 items test_step.py .Fx. @@ -391,7 +391,7 @@ If we run this:: ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = + self = def test_modification(self): > assert 0 @@ -453,7 +453,7 @@ We can run this:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 7 items test_step.py .Fx. @@ -463,17 +463,17 @@ We can run this:: ================================== ERRORS ================================== _______________________ ERROR at setup of test_root ________________________ - file /tmp/doc-exec-229/b/test_error.py, line 1 + file /tmp/doc-exec-73/b/test_error.py, line 1 def test_root(db): # no db here, will error out fixture 'db' not found - available fixtures: capsys, pytestconfig, monkeypatch, tmpdir, recwarn, capfd + available fixtures: monkeypatch, pytestconfig, tmpdir, capfd, capsys, recwarn use 'py.test --fixtures [testpath]' for help on them. - /tmp/doc-exec-229/b/test_error.py:1 + /tmp/doc-exec-73/b/test_error.py:1 ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = + self = def test_modification(self): > assert 0 @@ -482,25 +482,25 @@ We can run this:: test_step.py:9: AssertionError _________________________________ test_a1 __________________________________ - db = + db = def test_a1(db): > assert 0, db # to show value - E AssertionError: + E AssertionError: E assert 0 a/test_db.py:2: AssertionError _________________________________ test_a2 __________________________________ - db = + db = def test_a2(db): > assert 0, db # to show value - E AssertionError: + E AssertionError: E assert 0 a/test_db2.py:2: AssertionError - ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.04 seconds ========== + ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.03 seconds ========== The two test modules in the ``a`` directory see the same ``db`` fixture instance while the one test in the sister-directory ``b`` doesn't see it. We could of course @@ -555,7 +555,7 @@ and run them:: $ py.test test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_module.py FF @@ -563,7 +563,7 @@ and run them:: ================================= FAILURES ================================= ________________________________ test_fail1 ________________________________ - tmpdir = local('/tmp/pytest-22/test_fail10') + tmpdir = local('/tmp/pytest-112/test_fail10') def test_fail1(tmpdir): > assert 0 @@ -577,12 +577,12 @@ and run them:: E assert 0 test_module.py:4: AssertionError - ========================= 2 failed in 0.01 seconds ========================= + ========================= 2 failed in 0.02 seconds ========================= you will have a "failures" file which contains the failing test ids:: $ cat failures - test_module.py::test_fail1 (/tmp/pytest-22/test_fail10) + test_module.py::test_fail1 (/tmp/pytest-112/test_fail10) test_module.py::test_fail2 Making test result information available in fixtures @@ -645,7 +645,7 @@ and run it:: $ py.test -s test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 3 items test_module.py Esetting up a test failed! test_module.py::test_setup_fails diff --git a/doc/en/example/special.txt b/doc/en/example/special.txt index 9e9654941..4494ac8c4 100644 --- a/doc/en/example/special.txt +++ b/doc/en/example/special.txt @@ -69,4 +69,4 @@ If you run this without output capturing:: .test other .test_unit1 method called . - 4 passed in 0.05 seconds + 4 passed in 0.04 seconds diff --git a/doc/en/fixture.txt b/doc/en/fixture.txt index aa9982451..d06823ecb 100644 --- a/doc/en/fixture.txt +++ b/doc/en/fixture.txt @@ -76,7 +76,7 @@ marked ``smtp`` fixture function. Running the test looks like this:: $ py.test test_smtpsimple.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_smtpsimple.py F @@ -84,7 +84,7 @@ marked ``smtp`` fixture function. Running the test looks like this:: ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = + smtp = def test_ehlo(smtp): response, msg = smtp.ehlo() @@ -93,7 +93,7 @@ marked ``smtp`` fixture function. Running the test looks like this:: E TypeError: Type str doesn't support the buffer API test_smtpsimple.py:11: TypeError - ========================= 1 failed in 0.20 seconds ========================= + ========================= 1 failed in 0.28 seconds ========================= In the failure traceback we see that the test function was called with a ``smtp`` argument, the ``smtplib.SMTP()`` instance created by the fixture @@ -193,7 +193,7 @@ inspect what is going on and can now run the tests:: $ py.test test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_module.py FF @@ -201,7 +201,7 @@ inspect what is going on and can now run the tests:: ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = + smtp = def test_ehlo(smtp): response = smtp.ehlo() @@ -212,7 +212,7 @@ inspect what is going on and can now run the tests:: test_module.py:5: TypeError ________________________________ test_noop _________________________________ - smtp = + smtp = def test_noop(smtp): response = smtp.noop() @@ -221,7 +221,7 @@ inspect what is going on and can now run the tests:: E assert 0 test_module.py:11: AssertionError - ========================= 2 failed in 0.17 seconds ========================= + ========================= 2 failed in 0.28 seconds ========================= You see the two ``assert 0`` failing and more importantly you can also see that the same (module-scoped) ``smtp`` object was passed into the two @@ -269,7 +269,7 @@ Let's execute it:: $ py.test -s -q --tb=no FFteardown smtp - 2 failed in 0.16 seconds + 2 failed in 0.21 seconds We see that the ``smtp`` instance is finalized after the two tests finished execution. Note that if we decorated our fixture @@ -310,7 +310,7 @@ again, nothing much has changed:: $ py.test -s -q --tb=no FF - 2 failed in 0.16 seconds + 2 failed in 0.19 seconds Let's quickly create another test module that actually sets the server URL in its module namespace:: @@ -378,7 +378,7 @@ So let's just do another run:: ================================= FAILURES ================================= __________________________ test_ehlo[merlinux.eu] __________________________ - smtp = + smtp = def test_ehlo(smtp): response = smtp.ehlo() @@ -389,7 +389,7 @@ So let's just do another run:: test_module.py:5: TypeError __________________________ test_noop[merlinux.eu] __________________________ - smtp = + smtp = def test_noop(smtp): response = smtp.noop() @@ -400,7 +400,7 @@ So let's just do another run:: test_module.py:11: AssertionError ________________________ test_ehlo[mail.python.org] ________________________ - smtp = + smtp = def test_ehlo(smtp): response = smtp.ehlo() @@ -410,10 +410,10 @@ So let's just do another run:: test_module.py:5: TypeError -------------------------- Captured stdout setup --------------------------- - finalizing + finalizing ________________________ test_noop[mail.python.org] ________________________ - smtp = + smtp = def test_noop(smtp): response = smtp.noop() @@ -422,7 +422,7 @@ So let's just do another run:: E assert 0 test_module.py:11: AssertionError - 4 failed in 6.02 seconds + 4 failed in 7.02 seconds We see that our two test functions each ran twice, against the different ``smtp`` instances. Note also, that with the ``mail.python.org`` @@ -462,13 +462,13 @@ Here we declare an ``app`` fixture which receives the previously defined $ py.test -v test_appsetup.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 2 items test_appsetup.py::test_smtp_exists[merlinux.eu] PASSED test_appsetup.py::test_smtp_exists[mail.python.org] PASSED - ========================= 2 passed in 5.45 seconds ========================= + ========================= 2 passed in 6.63 seconds ========================= Due to the parametrization of ``smtp`` the test will run twice with two different ``App`` instances and respective smtp servers. There is no @@ -526,7 +526,7 @@ Let's run the tests in verbose mode and with looking at the print-output:: $ py.test -v -s test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 8 items test_module.py::test_0[1] test0 1 diff --git a/doc/en/getting-started.txt b/doc/en/getting-started.txt index b26cd170d..9708ff60c 100644 --- a/doc/en/getting-started.txt +++ b/doc/en/getting-started.txt @@ -27,7 +27,7 @@ Installation options:: To check your installation has installed the correct version:: $ py.test --version - This is pytest version 2.6.3, imported from /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/pytest.py + This is pytest version 2.6.4, imported from /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/pytest.py If you get an error checkout :ref:`installation issues`. @@ -49,7 +49,7 @@ That's it. You can execute the test function now:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_sample.py F @@ -127,7 +127,7 @@ run the module by passing its filename:: ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" @@ -163,7 +163,7 @@ before performing the test function call. Let's just run it:: ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-18/test_needsfiles0') + tmpdir = local('/tmp/pytest-108/test_needsfiles0') def test_needsfiles(tmpdir): print (tmpdir) @@ -172,8 +172,8 @@ before performing the test function call. Let's just run it:: test_tmpdir.py:3: AssertionError --------------------------- Captured stdout call --------------------------- - /tmp/pytest-18/test_needsfiles0 - 1 failed in 0.01 seconds + /tmp/pytest-108/test_needsfiles0 + 1 failed in 0.02 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff --git a/doc/en/index.txt b/doc/en/index.txt index 756c4331a..1481b303d 100644 --- a/doc/en/index.txt +++ b/doc/en/index.txt @@ -1,11 +1,6 @@ .. _features: -.. note:: - - next training: `professional testing with pytest and tox `_, 24-26th November 2014, Freiburg, Germany - - pytest: helps you write better programs ============================================= diff --git a/doc/en/parametrize.txt b/doc/en/parametrize.txt index 0b84f82c9..53b83acfd 100644 --- a/doc/en/parametrize.txt +++ b/doc/en/parametrize.txt @@ -53,7 +53,7 @@ them in turn:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 3 items test_expectation.py ..F @@ -100,12 +100,12 @@ Let's run this:: $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 3 items test_expectation.py ..x - =================== 2 passed, 1 xfailed in 0.02 seconds ==================== + =================== 2 passed, 1 xfailed in 0.01 seconds ==================== The one parameter set which caused a failure previously now shows up as an "xfailed (expected to fail)" test. @@ -170,8 +170,8 @@ Let's also run with a stringinput that will lead to a failing test:: def test_valid_string(stringinput): > assert stringinput.isalpha() - E assert () - E + where = '!'.isalpha + E assert () + E + where = '!'.isalpha test_strings.py:3: AssertionError 1 failed in 0.01 seconds @@ -185,7 +185,7 @@ listlist:: $ py.test -q -rs test_strings.py s ========================= short test summary info ========================== - SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/python.py:1139: got empty parameter set, function test_valid_string at /tmp/doc-exec-180/test_strings.py:1 + SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/python.py:1139: got empty parameter set, function test_valid_string at /tmp/doc-exec-23/test_strings.py:1 1 skipped in 0.01 seconds For further examples, you might want to look at :ref:`more diff --git a/doc/en/skipping.txt b/doc/en/skipping.txt index eca450ff6..73ac91573 100644 --- a/doc/en/skipping.txt +++ b/doc/en/skipping.txt @@ -164,7 +164,7 @@ Running it with the report-on-xfail option gives this output:: example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 7 items xfail_demo.py xxxxxxx @@ -182,7 +182,7 @@ Running it with the report-on-xfail option gives this output:: reason: reason XFAIL xfail_demo.py::test_hello7 - ======================== 7 xfailed in 0.05 seconds ========================= + ======================== 7 xfailed in 0.04 seconds ========================= .. _`skip/xfail with parametrize`: diff --git a/doc/en/tmpdir.txt b/doc/en/tmpdir.txt index a45d32b0e..dbb6cd56b 100644 --- a/doc/en/tmpdir.txt +++ b/doc/en/tmpdir.txt @@ -29,7 +29,7 @@ Running this would result in a passed test except for the last $ py.test test_tmpdir.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 1 items test_tmpdir.py F @@ -37,7 +37,7 @@ Running this would result in a passed test except for the last ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/tmp/pytest-19/test_create_file0') + tmpdir = local('/tmp/pytest-109/test_create_file0') def test_create_file(tmpdir): p = tmpdir.mkdir("sub").join("hello.txt") @@ -48,7 +48,7 @@ Running this would result in a passed test except for the last E assert 0 test_tmpdir.py:7: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= .. _`base temporary directory`: diff --git a/doc/en/unittest.txt b/doc/en/unittest.txt index 4f4760c9a..680f229d2 100644 --- a/doc/en/unittest.txt +++ b/doc/en/unittest.txt @@ -88,7 +88,7 @@ the ``self.db`` values in the traceback:: $ py.test test_unittest_db.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.25 -- pytest-2.6.3 + platform linux -- Python 3.4.0 -- py-1.4.26 -- pytest-2.6.4 collected 2 items test_unittest_db.py FF @@ -101,7 +101,7 @@ the ``self.db`` values in the traceback:: def test_method1(self): assert hasattr(self, "db") > assert 0, self.db # fail for demo purposes - E AssertionError: .DummyDB object at 0x2b938b865208> + E AssertionError: .DummyDB object at 0x2b98cc5a2e80> E assert 0 test_unittest_db.py:9: AssertionError @@ -111,11 +111,11 @@ the ``self.db`` values in the traceback:: def test_method2(self): > assert 0, self.db # fail for demo purposes - E AssertionError: .DummyDB object at 0x2b938b865208> + E AssertionError: .DummyDB object at 0x2b98cc5a2e80> E assert 0 test_unittest_db.py:12: AssertionError - ========================= 2 failed in 0.05 seconds ========================= + ========================= 2 failed in 0.04 seconds ========================= This default pytest traceback shows that the two test methods share the same ``self.db`` instance which was our intention diff --git a/setup.py b/setup.py index 7f699c85d..dbbc99158 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def main(): name='pytest', description='pytest: simple powerful testing with Python', long_description=long_description, - version='2.6.4.dev2', + version='2.6.4', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],