9 new commits in pytest: https://bitbucket.org/hpk42/pytest/commits/74af5f248bf4/ Changeset: 74af5f248bf4 Branch: env-addopts User: RonnyPfannschmidt Date: 2015-02-22 10:26:48+00:00 Summary: Close env-addopts branch Affected #: 0 files
https://bitbucket.org/hpk42/pytest/commits/93297892f253/ Changeset: 93297892f253 Branch: adopt-pytest-docs User: RonnyPfannschmidt Date: 2015-02-22 10:27:25+00:00 Summary: Close adopt-pytest-docs branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/0c03b0d86889/ Changeset: 0c03b0d86889 Branch: pastebin-xdist User: RonnyPfannschmidt Date: 2015-02-22 10:28:11+00:00 Summary: Close pastebin-xdist branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/c14aca1c0610/ Changeset: c14aca1c0610 Branch: techtonik/readmerst-fix-link-to-pypi-1416719991514 User: RonnyPfannschmidt Date: 2015-02-22 10:28:30+00:00 Summary: Close techtonik/readmerst-fix-link-to-pypi-1416719991514 branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/1e690a1455d1/ Changeset: 1e690a1455d1 Branch: okin/only-one-import-on-one-line-if-this-shou-1421239108222 User: RonnyPfannschmidt Date: 2015-02-22 10:29:32+00:00 Summary: Close okin/only-one-import-on-one-line-if-this-shou-1421239108222 branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/d31d7f842a7f/ Changeset: d31d7f842a7f Branch: fix-pastebin User: RonnyPfannschmidt Date: 2015-02-22 10:31:05+00:00 Summary: Close fix-pastebin branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/cf22549f75a0/ Changeset: cf22549f75a0 Branch: alex_gaynor/mark-pytest-as-a-universal-wheel-1414169551518 User: RonnyPfannschmidt Date: 2015-02-22 10:32:45+00:00 Summary: Close alex_gaynor/mark-pytest-as-a-universal-wheel-1414169551518 branch Affected #: 0 files https://bitbucket.org/hpk42/pytest/commits/ec62675c24c2/ Changeset: ec62675c24c2 User: RonnyPfannschmidt Date: 2015-02-22 10:45:07+00:00 Summary: merge in the 2.6 maintenance branch Affected #: 23 files diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf .hgtags --- a/.hgtags +++ b/.hgtags @@ -72,3 +72,4 @@ a4f9639702baa3eb4f3b16e162f74f7b69f3f9e1 2.6.1 a4f25c5e649892b5cc746d21be971e4773478af9 2.6.2 2967aa416a4f3cdb65fc75073a2a148e1f372742 2.6.3 +f03b6de8325f5b6c35cea7c3de092f134ea8ef07 2.6.4 diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -57,6 +57,12 @@ - fix issue614: fixed pastebin support. + +- fix issue620: add explanation in the --genscript target about what + the binary blob means. Thanks Dinu Gherman. + +- fix issue614: fixed pastebin support. + 2.6.3 ----------- diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/assert.txt --- a/doc/en/assert.txt +++ b/doc/en/assert.txt @@ -26,7 +26,7 @@ $ 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 @@ $ 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 @@ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/capture.txt --- a/doc/en/capture.txt +++ b/doc/en/capture.txt @@ -64,7 +64,7 @@ $ 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 @@ test_module.py:9: AssertionError -------------------------- Captured stdout setup --------------------------- - setting up <function test_func2 at 0x2b3173d7fbf8> + setting up <function test_func2 at 0x2af94bea1d08> ==================== 1 failed, 1 passed in 0.01 seconds ==================== Accessing captured output from a test function diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/conf.py --- 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/doctest.txt --- a/doc/en/doctest.txt +++ b/doc/en/doctest.txt @@ -44,12 +44,12 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/markers.txt --- a/doc/en/example/markers.txt +++ b/doc/en/example/markers.txt @@ -31,7 +31,7 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ 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 @@ -334,7 +334,7 @@ $ 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 @@ -345,7 +345,7 @@ $ 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 . @@ -463,12 +463,12 @@ $ 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 ==================== @@ -476,7 +476,7 @@ $ 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 @@ -527,7 +527,7 @@ $ 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 @@ -548,7 +548,7 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/nonpython.txt --- a/doc/en/example/nonpython.txt +++ b/doc/en/example/nonpython.txt @@ -27,10 +27,10 @@ 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 @@ 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: hello FAILED test_simple.yml::usecase: ok PASSED - test_simple.yml::usecase: hello FAILED ================================= FAILURES ================================= ______________________________ usecase: hello ______________________________ @@ -74,10 +74,10 @@ 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 <YamlFile 'test_simple.yml'> + <YamlItem 'hello'><YamlItem 'ok'> - <YamlItem 'hello'> ============================= in 0.03 seconds ============================= diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/parametrize.txt --- a/doc/en/example/parametrize.txt +++ b/doc/en/example/parametrize.txt @@ -181,7 +181,7 @@ $ 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 .... @@ -193,7 +193,7 @@ $ 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 <Module 'test_scenarios.py'><Class 'TestSampleWithScenarios'> @@ -257,7 +257,7 @@ $ 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 <Module 'test_backends.py'><Function 'test_db_initialized[d1]'> @@ -272,7 +272,7 @@ ================================= FAILURES ================================= _________________________ test_db_initialized[d2] __________________________ - db = <conftest.DB2 object at 0x2b24a8545390> + db = <conftest.DB2 object at 0x2b04d7936be0> def test_db_initialized(db): # a dummy test @@ -281,7 +281,7 @@ 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. @@ -326,16 +326,16 @@ $ py.test -q F.. ================================= FAILURES ================================= - ________________________ TestClass.test_equals[1-2] ________________________ + ________________________ TestClass.test_equals[2-1] ________________________ - self = <test_parametrize.TestClass object at 0x2b0ed5d8cdd8>, a = 1, b = 2 + self = <test_parametrize.TestClass object at 0x2af4cdee0da0>, 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 -------------------------------------------------------------- @@ -358,8 +358,8 @@ ================================= FAILURES ================================= ________________ test_basic_objects[python3.4-python2.6-42] ________________ - python1 = <multipython.Python object at 0x2b02a1bc79b0> - python2 = <multipython.Python object at 0x2b02a1bc7630>, obj = 42 + python1 = <multipython.Python object at 0x2afc7d8c2828> + python2 = <multipython.Python object at 0x2afc7d8c2588>, obj = 42 @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -372,7 +372,7 @@ 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. @@ -397,9 +397,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p0/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -411,11 +411,11 @@ ../../../.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 = <multipython.Python object at 0x2b02a1b66f28> - python2 = <multipython.Python object at 0x2b02a1b66198>, obj = {} + python1 = <multipython.Python object at 0x2afc7d8b8c88> + python2 = <multipython.Python object at 0x2afc7d8b8e48>, obj = {} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -428,7 +428,7 @@ 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. @@ -453,9 +453,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p1/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -467,11 +467,11 @@ ../../../.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 = <multipython.Python object at 0x2b02a1bcd320> - python2 = <multipython.Python object at 0x2b02a1bcd358>, obj = {1: 3} + python1 = <multipython.Python object at 0x2afc7d8bf6d8> + python2 = <multipython.Python object at 0x2afc7d8bf860>, obj = {1: 3} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -484,7 +484,7 @@ 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. @@ -509,9 +509,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p2/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.6/pickle.py", line 1370, in load E return Unpickler(file).load() @@ -523,11 +523,11 @@ ../../../.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 = <multipython.Python object at 0x2b02a1bc78d0> - python2 = <multipython.Python object at 0x2b02a1bc7128>, obj = 42 + python1 = <multipython.Python object at 0x2afc7d8b8710> + python2 = <multipython.Python object at 0x2afc7d8b8748>, obj = 42 @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -540,7 +540,7 @@ 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. @@ -565,9 +565,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p3/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -579,11 +579,11 @@ ../../../.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 = <multipython.Python object at 0x2b02a1bd2550> - python2 = <multipython.Python object at 0x2b02a1bd23c8>, obj = {} + python1 = <multipython.Python object at 0x2afc7d8bfb38> + python2 = <multipython.Python object at 0x2afc7d8bf3c8>, obj = {} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -596,7 +596,7 @@ 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. @@ -621,9 +621,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p4/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -635,11 +635,11 @@ ../../../.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 = <multipython.Python object at 0x2b02a1bcdeb8> - python2 = <multipython.Python object at 0x2b02a1bcdf98>, obj = {1: 3} + python1 = <multipython.Python object at 0x2afc7d8b86a0> + python2 = <multipython.Python object at 0x2afc7d8c2a90>, obj = {1: 3} @pytest.mark.parametrize("obj", [42, {}, {1:3},]) def test_basic_objects(python1, python2, obj): @@ -652,7 +652,7 @@ 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. @@ -677,9 +677,9 @@ 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 <module> + E File "/tmp/pytest-111/test_basic_objects_python3_4_p5/load.py", line 4, in <module> E obj = pickle.load(f) E File "/usr/lib/python2.7/pickle.py", line 1378, in load E return Unpickler(file).load() @@ -691,8 +691,8 @@ ../../../.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 -------------------------------------------------------------------- @@ -739,12 +739,12 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/pythoncollection.txt --- a/doc/en/example/pythoncollection.txt +++ b/doc/en/example/pythoncollection.txt @@ -43,7 +43,7 @@ $ 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 <Module 'check_myapp.py'><Class 'CheckMyApp'> @@ -88,7 +88,7 @@ . $ 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 <Module 'pythoncollection.py'><Function 'test_function'> @@ -141,10 +141,10 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/reportingdemo.txt --- a/doc/en/example/reportingdemo.txt +++ b/doc/en/example/reportingdemo.txt @@ -13,7 +13,7 @@ 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 @@ failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = <failure_demo.TestFailing object at 0x2adb9885cfd0> + self = <failure_demo.TestFailing object at 0x2b4436e4d390> def test_simple(self): def f(): @@ -40,13 +40,13 @@ > assert f() == g() E assert 42 == 43 - E + where 42 = <function TestFailing.test_simple.<locals>.f at 0x2adb9887e6a8>() - E + and 43 = <function TestFailing.test_simple.<locals>.g at 0x2adb9887e598>() + E + where 42 = <function TestFailing.test_simple.<locals>.f at 0x2b4436f1e6a8>() + E + and 43 = <function TestFailing.test_simple.<locals>.g at 0x2b4436f1e7b8>() failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = <failure_demo.TestFailing object at 0x2adb98841518> + self = <failure_demo.TestFailing object at 0x2b4436f167b8> def test_simple_multiline(self): otherfunc_multi( @@ -66,19 +66,19 @@ failure_demo.py:11: AssertionError ___________________________ TestFailing.test_not ___________________________ - self = <failure_demo.TestFailing object at 0x2adb98813278> + self = <failure_demo.TestFailing object at 0x2b4436f12668> def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = <function TestFailing.test_not.<locals>.f at 0x2adb9887e840>() + E + where 42 = <function TestFailing.test_not.<locals>.f at 0x2b4436f1ebf8>() failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb987a9588> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436efaba8> def test_eq_text(self): > assert 'spam' == 'eggs' @@ -89,7 +89,7 @@ failure_demo.py:42: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb9881fe80> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ee02e8> def test_eq_similar_text(self): > assert 'foo 1 bar' == 'foo 2 bar' @@ -102,7 +102,7 @@ failure_demo.py:45: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb98894b38> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ed5e48> def test_eq_multiline_text(self): > assert 'foo\nspam\nbar' == 'foo\neggs\nbar' @@ -115,7 +115,7 @@ failure_demo.py:48: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb98812fd0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ed2240> def test_eq_long_text(self): a = '1'*100 + 'a' + '2'*100 @@ -132,7 +132,7 @@ failure_demo.py:53: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb987ce240> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436f18780> def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,17 +156,18 @@ failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb98841a58> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436e42b00> 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 = <failure_demo.TestSpecialisedExplanations object at 0x2adb987e4e48> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436f164e0> def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -174,11 +175,12 @@ > 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 = <failure_demo.TestSpecialisedExplanations object at 0x2adb98843d30> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436f12c50> def test_eq_dict(self): > assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0} @@ -190,11 +192,12 @@ 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 = <failure_demo.TestSpecialisedExplanations object at 0x2adb98822b38> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ec1208> def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -206,21 +209,23 @@ 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 = <failure_demo.TestSpecialisedExplanations object at 0x2adb987a96d8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436efab70> 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 = <failure_demo.TestSpecialisedExplanations object at 0x2adb987b72e8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436d73278> def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -229,7 +234,7 @@ failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb98894908> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ebfac8> def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -247,7 +252,7 @@ failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb9885c898> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ee0898> def test_not_in_text_single(self): text = 'single foo line' @@ -260,7 +265,7 @@ failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb987cc9e8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436ed5748> def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -273,7 +278,7 @@ failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = <failure_demo.TestSpecialisedExplanations object at 0x2adb987d2748> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b4436e4db70> def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -292,7 +297,7 @@ i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute.<locals>.Foo object at 0x2adb987b5470>.b + E + where 1 = <failure_demo.test_attribute.<locals>.Foo object at 0x2b4436e42ac8>.b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -302,8 +307,8 @@ b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2adb987d0390>.b - E + where <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2adb987d0390> = <class 'failure_demo.test_attribute_instance.<locals>.Foo'>() + E + where 1 = <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2b4436f185c0>.b + E + where <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2b4436f185c0> = <class 'failure_demo.test_attribute_instance.<locals>.Foo'>() failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -319,7 +324,7 @@ failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = <failure_demo.test_attribute_failure.<locals>.Foo object at 0x2adb98822cf8> + self = <failure_demo.test_attribute_failure.<locals>.Foo object at 0x2b4436f16a58> def _get_b(self): > raise Exception('Failed to get attrib') @@ -335,15 +340,15 @@ b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2adb98841dd8>.b - E + where <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2adb98841dd8> = <class 'failure_demo.test_attribute_multiple.<locals>.Foo'>() - E + and 2 = <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2adb98841a90>.b - E + where <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2adb98841a90> = <class 'failure_demo.test_attribute_multiple.<locals>.Bar'>() + E + where 1 = <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2b4436f12a90>.b + E + where <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2b4436f12a90> = <class 'failure_demo.test_attribute_multiple.<locals>.Foo'>() + E + and 2 = <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2b4436f12ac8>.b + E + where <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2b4436f12ac8> = <class 'failure_demo.test_attribute_multiple.<locals>.Bar'>() failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = <failure_demo.TestRaises object at 0x2adb98854668> + self = <failure_demo.TestRaises object at 0x2b4436ec1d68> def test_raises(self): s = 'qwe' @@ -358,7 +363,7 @@ <0-codegen /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/python.py:1028>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = <failure_demo.TestRaises object at 0x2adb988818d0> + self = <failure_demo.TestRaises object at 0x2b4436ee9860> def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -367,7 +372,7 @@ failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = <failure_demo.TestRaises object at 0x2adb9885cc50> + self = <failure_demo.TestRaises object at 0x2b4436ed5198> def test_raise(self): > raise ValueError("demo error") @@ -376,7 +381,7 @@ failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = <failure_demo.TestRaises object at 0x2adb988430b8> + self = <failure_demo.TestRaises object at 0x2b4436ebf320> def test_tupleerror(self): > a,b = [1] @@ -385,7 +390,7 @@ failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = <failure_demo.TestRaises object at 0x2adb9881fa20> + self = <failure_demo.TestRaises object at 0x2b4436f1c6d8> def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -398,7 +403,7 @@ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = <failure_demo.TestRaises object at 0x2adb98894a90> + self = <failure_demo.TestRaises object at 0x2b4436e6abe0> def test_some_error(self): > if namenotexi: @@ -426,7 +431,7 @@ <2-codegen 'abc-123' /home/hpk/p/pytest/doc/en/example/assertion/failure_demo.py:162>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ - self = <failure_demo.TestMoreErrors object at 0x2adb98812da0> + self = <failure_demo.TestMoreErrors object at 0x2b4436ee59e8> def test_complex_error(self): def f(): @@ -450,7 +455,7 @@ failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = <failure_demo.TestMoreErrors object at 0x2adb9884d4a8> + self = <failure_demo.TestMoreErrors object at 0x2b4436f1a940> def test_z1_unpack_error(self): l = [] @@ -460,7 +465,7 @@ failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = <failure_demo.TestMoreErrors object at 0x2adb987b52b0> + self = <failure_demo.TestMoreErrors object at 0x2b4436ef1ef0> def test_z2_type_error(self): l = 3 @@ -470,19 +475,19 @@ failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = <failure_demo.TestMoreErrors object at 0x2adb988224e0> + self = <failure_demo.TestMoreErrors object at 0x2b4436f16710> def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert <built-in method startswith of str object at 0x2adb987a9ca8>('456') - E + where <built-in method startswith of str object at 0x2adb987a9ca8> = '123'.startswith + E assert <built-in method startswith of str object at 0x2b4436e42ea0>('456') + E + where <built-in method startswith of str object at 0x2b4436e42ea0> = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = <failure_demo.TestMoreErrors object at 0x2adb98836898> + self = <failure_demo.TestMoreErrors object at 0x2b4436f18c88> def test_startswith_nested(self): def f(): @@ -490,15 +495,15 @@ def g(): return "456" > assert f().startswith(g()) - E assert <built-in method startswith of str object at 0x2adb987a9ca8>('456') - E + where <built-in method startswith of str object at 0x2adb987a9ca8> = '123'.startswith - E + where '123' = <function TestMoreErrors.test_startswith_nested.<locals>.f at 0x2adb9887e9d8>() - E + and '456' = <function TestMoreErrors.test_startswith_nested.<locals>.g at 0x2adb9887e7b8>() + E assert <built-in method startswith of str object at 0x2b4436e42ea0>('456') + E + where <built-in method startswith of str object at 0x2b4436e42ea0> = '123'.startswith + E + where '123' = <function TestMoreErrors.test_startswith_nested.<locals>.f at 0x2b4436f1e950>() + E + and '456' = <function TestMoreErrors.test_startswith_nested.<locals>.g at 0x2b4436f1e840>() failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = <failure_demo.TestMoreErrors object at 0x2adb987b77f0> + self = <failure_demo.TestMoreErrors object at 0x2b4436eed0f0> def test_global_func(self): > assert isinstance(globf(42), float) @@ -508,18 +513,18 @@ failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = <failure_demo.TestMoreErrors object at 0x2adb988729b0> + self = <failure_demo.TestMoreErrors object at 0x2b4436e67c50> def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = <failure_demo.TestMoreErrors object at 0x2adb988729b0>.x + E + where 42 = <failure_demo.TestMoreErrors object at 0x2b4436e67c50>.x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = <failure_demo.TestMoreErrors object at 0x2adb98812f98> + self = <failure_demo.TestMoreErrors object at 0x2b4436ebf668> def test_compare(self): > assert globf(10) < 5 @@ -529,7 +534,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = <failure_demo.TestMoreErrors object at 0x2adb987d0198> + self = <failure_demo.TestMoreErrors object at 0x2b4436edf588> def test_try_finally(self): x = 1 @@ -540,7 +545,7 @@ failure_demo.py:210: AssertionError ___________________ TestCustomAssertMsg.test_single_line ___________________ - self = <failure_demo.TestCustomAssertMsg object at 0x2adb98894cc0> + self = <failure_demo.TestCustomAssertMsg object at 0x2b4436ed5128> def test_single_line(self): class A: @@ -554,7 +559,7 @@ failure_demo.py:221: AssertionError ____________________ TestCustomAssertMsg.test_multiline ____________________ - self = <failure_demo.TestCustomAssertMsg object at 0x2adb988414e0> + self = <failure_demo.TestCustomAssertMsg object at 0x2b4436e6ad30> def test_multiline(self): class A: @@ -571,7 +576,7 @@ failure_demo.py:227: AssertionError ___________________ TestCustomAssertMsg.test_custom_repr ___________________ - self = <failure_demo.TestCustomAssertMsg object at 0x2adb9885c668> + self = <failure_demo.TestCustomAssertMsg object at 0x2b4436ee92b0> def test_custom_repr(self): class JSON: @@ -589,4 +594,4 @@ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/simple.txt --- a/doc/en/example/simple.txt +++ b/doc/en/example/simple.txt @@ -55,7 +55,7 @@ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ $ 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 @@ ========================= 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 @@ $ 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 @@ ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = <test_step.TestUserHandling object at 0x2af9f0d94470> + self = <test_step.TestUserHandling object at 0x2aad15c6d048> def test_modification(self): > assert 0 @@ -453,7 +453,7 @@ $ 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 @@ ================================== 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 = <test_step.TestUserHandling object at 0x2b0f0e2ff0b8> + self = <test_step.TestUserHandling object at 0x2b058dc29e10> def test_modification(self): > assert 0 @@ -482,25 +482,25 @@ test_step.py:9: AssertionError _________________________________ test_a1 __________________________________ - db = <conftest.DB object at 0x2b0f0e2ff630> + db = <conftest.DB object at 0x2b058db494a8> def test_a1(db): > assert 0, db # to show value - E AssertionError: <conftest.DB object at 0x2b0f0e2ff630> + E AssertionError: <conftest.DB object at 0x2b058db494a8> E assert 0 a/test_db.py:2: AssertionError _________________________________ test_a2 __________________________________ - db = <conftest.DB object at 0x2b0f0e2ff630> + db = <conftest.DB object at 0x2b058db494a8> def test_a2(db): > assert 0, db # to show value - E AssertionError: <conftest.DB object at 0x2b0f0e2ff630> + E AssertionError: <conftest.DB object at 0x2b058db494a8> 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 @@ $ 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 @@ ================================= 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 @@ 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 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/example/special.txt --- a/doc/en/example/special.txt +++ b/doc/en/example/special.txt @@ -69,4 +69,4 @@ .test other .test_unit1 method called . - 4 passed in 0.05 seconds + 4 passed in 0.04 seconds diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/fixture.txt --- a/doc/en/fixture.txt +++ b/doc/en/fixture.txt @@ -76,7 +76,7 @@ $ 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 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP object at 0x2b040fa62128> + smtp = <smtplib.SMTP object at 0x2b88f2d1b0b8> def test_ehlo(smtp): response, msg = smtp.ehlo() @@ -93,7 +93,7 @@ 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 @@ $ 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 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP object at 0x2abe3c757208> + smtp = <smtplib.SMTP object at 0x2b29b71bd8d0> def test_ehlo(smtp): response = smtp.ehlo() @@ -212,7 +212,7 @@ test_module.py:5: TypeError ________________________________ test_noop _________________________________ - smtp = <smtplib.SMTP object at 0x2abe3c757208> + smtp = <smtplib.SMTP object at 0x2b29b71bd8d0> def test_noop(smtp): response = smtp.noop() @@ -221,7 +221,7 @@ 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 @@ $ 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 @@ $ 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 @@ ================================= FAILURES ================================= __________________________ test_ehlo[merlinux.eu] __________________________ - smtp = <smtplib.SMTP object at 0x2afbf4496828> + smtp = <smtplib.SMTP object at 0x2b6b796568d0> def test_ehlo(smtp): response = smtp.ehlo() @@ -389,7 +389,7 @@ test_module.py:5: TypeError __________________________ test_noop[merlinux.eu] __________________________ - smtp = <smtplib.SMTP object at 0x2afbf4496828> + smtp = <smtplib.SMTP object at 0x2b6b796568d0> def test_noop(smtp): response = smtp.noop() @@ -400,7 +400,7 @@ test_module.py:11: AssertionError ________________________ test_ehlo[mail.python.org] ________________________ - smtp = <smtplib.SMTP object at 0x2afbf4496d68> + smtp = <smtplib.SMTP object at 0x2b6b79656780> def test_ehlo(smtp): response = smtp.ehlo() @@ -410,10 +410,10 @@ test_module.py:5: TypeError -------------------------- Captured stdout setup --------------------------- - finalizing <smtplib.SMTP object at 0x2afbf4496828> + finalizing <smtplib.SMTP object at 0x2b6b796568d0> ________________________ test_noop[mail.python.org] ________________________ - smtp = <smtplib.SMTP object at 0x2afbf4496d68> + smtp = <smtplib.SMTP object at 0x2b6b79656780> def test_noop(smtp): response = smtp.noop() @@ -422,7 +422,7 @@ 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`` @@ -517,13 +517,13 @@ $ 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 @@ -581,7 +581,7 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/getting-started.txt --- a/doc/en/getting-started.txt +++ b/doc/en/getting-started.txt @@ -27,7 +27,7 @@ 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 @@ $ 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 @@ ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = <test_class.TestClass object at 0x2b39478f7438> + self = <test_class.TestClass object at 0x2b9209071470> def test_two(self): x = "hello" @@ -163,7 +163,7 @@ ================================= 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 @@ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/index.txt --- a/doc/en/index.txt +++ b/doc/en/index.txt @@ -1,14 +1,10 @@ .. _features: -.. note:: - Are you an experienced pytest user, or an open source project that needs some help getting started with pytest? April 2015 is `adopt pytest month`_! .. _`adopt pytest month`: adopt.html - - pytest: helps you write better programs ============================================= diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/parametrize.txt --- a/doc/en/parametrize.txt +++ b/doc/en/parametrize.txt @@ -53,7 +53,7 @@ $ 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 @@ $ 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 @@ def test_valid_string(stringinput): > assert stringinput.isalpha() - E assert <built-in method isalpha of str object at 0x2b1c6de5bb20>() - E + where <built-in method isalpha of str object at 0x2b1c6de5bb20> = '!'.isalpha + E assert <built-in method isalpha of str object at 0x2ae3eb376c00>() + E + where <built-in method isalpha of str object at 0x2ae3eb376c00> = '!'.isalpha test_strings.py:3: AssertionError 1 failed in 0.01 seconds @@ -185,7 +185,7 @@ $ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/skipping.txt --- a/doc/en/skipping.txt +++ b/doc/en/skipping.txt @@ -164,7 +164,7 @@ 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 @@ 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 -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/tmpdir.txt --- a/doc/en/tmpdir.txt +++ b/doc/en/tmpdir.txt @@ -29,7 +29,7 @@ $ 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 @@ ================================= 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 @@ E assert 0 test_tmpdir.py:7: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= .. _`base temporary directory`: diff -r 46d5ac0ba396af887969a3cc9940fccba5ff1955 -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf doc/en/unittest.txt --- a/doc/en/unittest.txt +++ b/doc/en/unittest.txt @@ -88,7 +88,7 @@ $ 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 @@ def test_method1(self): assert hasattr(self, "db") > assert 0, self.db # fail for demo purposes - E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2b938b865208> + E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2b98cc5a2e80> E assert 0 test_unittest_db.py:9: AssertionError @@ -111,11 +111,11 @@ def test_method2(self): > assert 0, self.db # fail for demo purposes - E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2b938b865208> + E AssertionError: <conftest.db_class.<locals>.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 https://bitbucket.org/hpk42/pytest/commits/181d08e03c11/ Changeset: 181d08e03c11 User: RonnyPfannschmidt Date: 2015-02-22 11:29:26+00:00 Summary: merge Affected #: 3 files diff -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf -r 181d08e03c11f34aac5f3358a92cc4d1d5557963 doc/en/faq.txt --- a/doc/en/faq.txt +++ b/doc/en/faq.txt @@ -30,15 +30,15 @@ If you are using trial's unittest.TestCase chances are that you can just run your tests even if you return Deferreds. In addition, there also is a dedicated `pytest-twisted -<http://pypi.python.org/pypi/pytest-twisted>`_ plugin which allows to -return deferreds from pytest-style tests, allowing to use +<http://pypi.python.org/pypi/pytest-twisted>`_ plugin which allows you to +return deferreds from pytest-style tests, allowing the use of :ref:`fixtures` and other features. how does pytest work with Django? ++++++++++++++++++++++++++++++++++++++++++++++ In 2012, some work is going into the `pytest-django plugin <http://pypi.python.org/pypi/pytest-django>`_. It substitutes the usage of Django's -``manage.py test`` and allows to use all pytest features_ most of which +``manage.py test`` and allows the use of all pytest features_ most of which are not available from Django directly. .. _features: features.html @@ -49,7 +49,7 @@ Around 2007 (version ``0.8``) some people thought that ``pytest`` was using too much "magic". It had been part of the `pylib`_ which -contains a lot of unreleated python library code. Around 2010 there +contains a lot of unrelated python library code. Around 2010 there was a major cleanup refactoring, which removed unused or deprecated code and resulted in the new ``pytest`` PyPI package which strictly contains only test-related code. This release also brought a complete pluginification @@ -63,7 +63,7 @@ Nowadays, ``pytest`` explicitely rewrites assert statements in test modules in order to provide more useful :ref:`assert feedback <assertfeedback>`. This completely avoids previous issues of confusing assertion-reporting. -It also means, that you can use Python's ``-O`` optimization without loosing +It also means, that you can use Python's ``-O`` optimization without losing assertions in test modules. ``pytest`` contains a second, mostly obsolete, assert debugging technique, @@ -152,13 +152,13 @@ Issues with pytest, multiprocess and setuptools? +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -On windows the multiprocess package will instantiate sub processes +On Windows the multiprocess package will instantiate sub processes by pickling and thus implicitly re-import a lot of local modules. Unfortunately, setuptools-0.6.11 does not ``if __name__=='__main__'`` protect its generated command line script. This leads to infinite recursion when running a test that instantiates Processes. -As of middle 2013, there shouldn't be a problem anymore when you +As of mid-2013, there shouldn't be a problem anymore when you use the standard setuptools (note that distribute has been merged back into setuptools which is now shipped directly with virtualenv). diff -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf -r 181d08e03c11f34aac5f3358a92cc4d1d5557963 testing/test_doctest.py --- a/testing/test_doctest.py +++ b/testing/test_doctest.py @@ -3,8 +3,6 @@ import pdb -xfail_if_pdbpp_installed = pytest.mark.xfail(hasattr(pdb, "__author__"), - reason="doctest/pdbpp problem: https://bitbucket.org/antocuni/pdb/issue/24/doctests-fail-when-pdbpp-is-installed";, run=False) class TestDoctests: @@ -161,7 +159,6 @@ reprec = testdir.inline_run(p, "--doctest-modules") reprec.assertoutcome(failed=1) - @xfail_if_pdbpp_installed def test_doctestmodule_external_and_issue116(self, testdir): p = testdir.mkpydir("hello") p.join("__init__.py").write(py.code.Source(""" @@ -201,7 +198,6 @@ "*test_txtfile_failing.txt:2: DocTestFailure" ]) - @xfail_if_pdbpp_installed def test_txtfile_with_fixtures(self, testdir): p = testdir.maketxtfile(""" >>> dir = getfixture('tmpdir') @@ -211,7 +207,6 @@ reprec = testdir.inline_run(p, ) reprec.assertoutcome(passed=1) - @xfail_if_pdbpp_installed def test_txtfile_with_usefixtures_in_ini(self, testdir): testdir.makeini(""" [pytest] @@ -232,7 +227,6 @@ reprec = testdir.inline_run(p, ) reprec.assertoutcome(passed=1) - @xfail_if_pdbpp_installed def test_doctestmodule_with_fixtures(self, testdir): p = testdir.makepyfile(""" ''' @@ -244,7 +238,6 @@ reprec = testdir.inline_run(p, "--doctest-modules") reprec.assertoutcome(passed=1) - @xfail_if_pdbpp_installed def test_doctestmodule_three_tests(self, testdir): p = testdir.makepyfile(""" ''' @@ -270,7 +263,6 @@ reprec = testdir.inline_run(p, "--doctest-modules") reprec.assertoutcome(passed=3) - @xfail_if_pdbpp_installed def test_doctestmodule_two_tests_one_fail(self, testdir): p = testdir.makepyfile(""" class MyClass: diff -r ec62675c24c2454d9f90f5e59a4f3e1e6aff89bf -r 181d08e03c11f34aac5f3358a92cc4d1d5557963 testing/test_pdb.py --- a/testing/test_pdb.py +++ b/testing/test_pdb.py @@ -2,7 +2,6 @@ import py import sys -from test_doctest import xfail_if_pdbpp_installed class TestPDB: def pytest_funcarg__pdblist(self, request): @@ -187,7 +186,6 @@ if child.isalive(): child.wait() - @xfail_if_pdbpp_installed def test_pdb_interaction_doctest(self, testdir): p1 = testdir.makepyfile(""" import pytest Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ pytest-commit mailing list pytest-commit@python.org https://mail.python.org/mailman/listinfo/pytest-commit
