4 new commits in pytest: https://bitbucket.org/hpk42/pytest/commits/a4f25c5e6498/ Changeset: a4f25c5e6498 User: hpk42 Date: 2014-09-05 13:13:23 Summary: prepare 2.6.2, release announcement, also add HOWTORELEASE.rst Affected #: 7 files
diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -NEXT +2.6.2 ----------- - Added function pytest.freeze_includes(), which makes it easy to embed diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 HOWTORELEASE.rst --- /dev/null +++ b/HOWTORELEASE.rst @@ -0,0 +1,44 @@ + +How to release pytest (draft) +-------------------------------------------- + +1. bump version numbers in setup.py and pytest/__init__.py + +2. check and finalize CHANGELOG + +3. write doc/en/announce/pytest-VERSION.txt and include + it in doc/en/announce/index.txt + +4. use devpi for uploading a release tarball to a staging area: + - ``devpi use https://devpi.net/USER/dev`` + - ``devpi upload`` + +5. run from multiple machines: + - ``devpi use https://devpi.net/USER/dev`` + - ``devpi test pytest-VERSION`` + +6. check that tests pass for relevant combinations with + ``devpi list pytest`` + or look at failures with "devpi list -f pytest". + There will be some failed environments like e.g. the py33-trial + or py27-pexpect tox environments on Win32 platforms + which is ok (tox does not support skipping on + per-platform basis yet). + +7. go to "doc/en" and upload docs with "make install" + (the latter requires ssh-login permissions on pytest.org + because it uses rsync). Note that the "install" target of + doc/en/Makefile defines where the rsync goes to, typically + to the "latest" section of pytest.org. + +8. publish to pypi "devpi push pytest-2.6.2 pypi:NAME" where NAME + is the name of pypi.python.org as configured in your + ~/.pypirc file -- it's the same you would use with + "setup.py upload -r NAME" + +9. send release announcement to mailing lists: + + pytest-dev + testing-in-python + python-announce-l...@python.org + diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 _pytest/__init__.py --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.6.2.dev1' +__version__ = '2.6.2' diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 doc/en/announce/index.txt --- a/doc/en/announce/index.txt +++ b/doc/en/announce/index.txt @@ -5,6 +5,9 @@ .. toctree:: :maxdepth: 2 + release-2.6.2 + release-2.6.1 + release-2.6.0 release-2.5.2 release-2.5.1 release-2.5.0 diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 doc/en/announce/release-2.6.2.txt --- /dev/null +++ b/doc/en/announce/release-2.6.2.txt @@ -0,0 +1,52 @@ +pytest-2.6.2: few fixes and cx_freeze support +=========================================================================== + +pytest is a mature Python testing tool with more than a 1100 tests +against itself, passing on many different interpreters and platforms. +This release is drop-in compatible to 2.5.2 and 2.6.X. It also +brings support for including pytest with cx_freeze or similar +freezing tools into your single-file app distribution. For details +see the CHANGELOG below. + +See docs at: + + http://pytest.org + +As usual, you can upgrade from pypi via:: + + pip install -U pytest + +Thanks to all who contributed, among them: + + Floris Bruynooghe + Benjamin Peterson + Bruno Oliveira + +have fun, +holger krekel + +2.6.2 +----------- + +- Added function pytest.freeze_includes(), which makes it easy to embed + pytest into executables using tools like cx_freeze. + See docs for examples and rationale. Thanks Bruno Oliveira. + +- Improve assertion rewriting cache invalidation precision. + +- fixed issue561: adapt autouse fixture example for python3. + +- fixed issue453: assertion rewriting issue with __repr__ containing + "\n{", "\n}" and "\n~". + +- fix issue560: correctly display code if an "else:" or "finally:" is + followed by statements on the same line. + +- Fix example in monkeypatch documentation, thanks t-8ch. + +- fix issue572: correct tmpdir doc example for python3. + +- Do not mark as universal wheel because Python 2.6 is different from + other builds due to the extra argparse dependency. Fixes issue566. + Thanks sontek. + diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 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.1" +release = "2.6.2" import sys, os diff -r 548f02cb5efaf71a280e2e21a3378e809652658a -r a4f25c5e649892b5cc746d21be971e4773478af9 setup.py --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def main(): - install_requires = ['py>=1.4.24.dev1'] + install_requires = ['py>=1.4.24'] if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2): install_requires.append('argparse') if sys.platform == 'win32': @@ -27,7 +27,7 @@ name='pytest', description='pytest: simple powerful testing with Python', long_description=long_description, - version='2.6.2.dev1', + version='2.6.2', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], https://bitbucket.org/hpk42/pytest/commits/b2d567a5fe91/ Changeset: b2d567a5fe91 User: hpk42 Date: 2014-09-05 13:47:48 Summary: Added tag 2.6.2 for changeset a4f25c5e6498 Affected #: 1 file diff -r a4f25c5e649892b5cc746d21be971e4773478af9 -r b2d567a5fe91815ae55b3a7354be6eb38762683f .hgtags --- a/.hgtags +++ b/.hgtags @@ -70,3 +70,4 @@ 60725b17a9d1af4100abb8be3f9f4ddf6262bf34 2.6.0 88af949b9611494e2c65d528f9e565b00fb7e8ca 2.6.0 a4f9639702baa3eb4f3b16e162f74f7b69f3f9e1 2.6.1 +a4f25c5e649892b5cc746d21be971e4773478af9 2.6.2 https://bitbucket.org/hpk42/pytest/commits/16556bd3458e/ Changeset: 16556bd3458e User: hpk42 Date: 2014-09-05 13:55:00 Summary: regen docs for 2.6.2 Affected #: 15 files diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_assert1.py F @@ -132,7 +132,7 @@ $ py.test test_assert2.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_assert2.py F diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 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 0x2b5d6a81c9d8> + setting up <function test_func2 at 0x2ae19606fc80> ==================== 1 failed, 1 passed in 0.01 seconds ==================== Accessing captured output from a test function diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items mymodule.py . - ========================= 1 passed in 0.06 seconds ========================= + ========================= 1 passed in 0.07 seconds ========================= It is possible to use fixtures using the ``getfixture`` helper:: diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_something_quick PASSED @@ -146,14 +146,14 @@ $ py.test -k "http or quick" -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 4 items test_server.py::test_send_http PASSED test_server.py::test_something_quick PASSED ================= 2 tests deselected by '-khttp or quick' ================== - ================== 2 passed, 2 deselected in 0.01 seconds ================== + ================== 2 passed, 2 deselected in 0.02 seconds ================== .. note:: @@ -326,7 +326,7 @@ $ py.test -E stage2 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_someenv.py s @@ -337,7 +337,7 @@ $ py.test -E stage1 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_someenv.py . @@ -455,12 +455,12 @@ $ py.test -rs # this option reports skip reasons =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 4 items test_plat.py sss. ========================= short test summary info ========================== - SKIP [3] /tmp/doc-exec-238/conftest.py:12: cannot run on platform linux + SKIP [3] /tmp/doc-exec-82/conftest.py:12: cannot run on platform linux =================== 1 passed, 3 skipped in 0.01 seconds ==================== @@ -468,7 +468,7 @@ $ py.test -m linux2 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 4 items test_plat.py s @@ -519,7 +519,7 @@ $ py.test -m interface --tb=short =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 4 items test_module.py FF @@ -540,7 +540,7 @@ $ py.test -m "interface or event" --tb=short =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 4 items test_module.py FFF @@ -559,4 +559,4 @@ assert 0 E assert 0 ============= 1 tests deselected by "-m 'interface or event'" ============== - ================== 3 failed, 1 deselected in 0.01 seconds ================== + ================== 3 failed, 1 deselected in 0.02 seconds ================== diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c doc/en/example/nonpython.txt --- a/doc/en/example/nonpython.txt +++ b/doc/en/example/nonpython.txt @@ -27,7 +27,7 @@ nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items test_simple.yml .F @@ -37,7 +37,7 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.03 seconds ==================== + ==================== 1 failed, 1 passed in 0.04 seconds ==================== You get one dot for the passing ``sub1: sub1`` check and one failure. Obviously in the above ``conftest.py`` you'll want to implement a more @@ -56,7 +56,7 @@ nonpython $ py.test -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 2 items test_simple.yml::usecase: ok PASSED @@ -67,17 +67,17 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.03 seconds ==================== + ==================== 1 failed, 1 passed in 0.05 seconds ==================== While developing your custom test collection and execution it's also 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items <YamlFile 'test_simple.yml'><YamlItem 'ok'><YamlItem 'hello'> - ============================= in 0.03 seconds ============================= + ============================= in 0.04 seconds ============================= diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 3 items <Module 'pythoncollection.py'><Function 'test_function'> @@ -141,7 +141,7 @@ $ py.test --collect-only =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 0 items ============================= in 0.01 seconds ============================= diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 39 items failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -30,7 +30,7 @@ failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = <failure_demo.TestFailing object at 0x2aec3e52d470> + self = <failure_demo.TestFailing object at 0x2aab6e68c550> 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 0x2aec3e47b158>() - E + and 43 = <function TestFailing.test_simple.<locals>.g at 0x2aec3e47b268>() + E + where 42 = <function TestFailing.test_simple.<locals>.f at 0x2aab6e7559d8>() + E + and 43 = <function TestFailing.test_simple.<locals>.g at 0x2aab6e755ea0>() failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = <failure_demo.TestFailing object at 0x2aec3e474ac8> + self = <failure_demo.TestFailing object at 0x2aab6e7fcd68> 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 0x2aec3e5156a0> + self = <failure_demo.TestFailing object at 0x2aab6e7f7550> 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 0x2aec3e47e620>() + E + where 42 = <function TestFailing.test_not.<locals>.f at 0x2aab6e7617b8>() failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e50cba8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7efdd8> 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 0x2aec3e4e24e0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7bdb70> 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 0x2aec3e4cc6d8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e75d128> 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 0x2aec3e501908> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e815b00> 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 0x2aec3e3af048> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7cdc50> def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,7 +156,7 @@ failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e474c50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e80e2b0> def test_eq_list(self): > assert [0, 1, 2] == [0, 1, 3] @@ -166,7 +166,7 @@ failure_demo.py:61: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e515dd8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7df940> def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -178,7 +178,7 @@ failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e4a5ef0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7f7ba8> def test_eq_dict(self): > assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0} @@ -194,7 +194,7 @@ failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e4a2e48> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e784fd0> def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -210,7 +210,7 @@ failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e4e0c50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e777550> def test_eq_longer_list(self): > assert [1,2] == [1,2,3] @@ -220,7 +220,7 @@ failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e4950f0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7c00f0> def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -229,7 +229,7 @@ failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e474f98> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e7df588> def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -247,7 +247,7 @@ failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e5333c8> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e75da58> def test_not_in_text_single(self): text = 'single foo line' @@ -260,7 +260,7 @@ failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e4ccb70> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e83d320> def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -273,7 +273,7 @@ failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = <failure_demo.TestSpecialisedExplanations object at 0x2aec3e502080> + self = <failure_demo.TestSpecialisedExplanations object at 0x2aab6e815198> def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -292,7 +292,7 @@ i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute.<locals>.Foo object at 0x2aec3e519c18>.b + E + where 1 = <failure_demo.test_attribute.<locals>.Foo object at 0x2aab6e61ed30>.b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -302,8 +302,8 @@ b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2aec3e52d898>.b - E + where <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2aec3e52d898> = <class 'failure_demo.test_attribute_instance.<locals>.Foo'>() + E + where 1 = <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2aab6e80e400>.b + E + where <failure_demo.test_attribute_instance.<locals>.Foo object at 0x2aab6e80e400> = <class 'failure_demo.test_attribute_instance.<locals>.Foo'>() failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -319,7 +319,7 @@ failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = <failure_demo.test_attribute_failure.<locals>.Foo object at 0x2aec3e4e0b38> + self = <failure_demo.test_attribute_failure.<locals>.Foo object at 0x2aab6e7fccc0> def _get_b(self): > raise Exception('Failed to get attrib') @@ -335,15 +335,15 @@ b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2aec3e4a5748>.b - E + where <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2aec3e4a5748> = <class 'failure_demo.test_attribute_multiple.<locals>.Foo'>() - E + and 2 = <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2aec3e4a51d0>.b - E + where <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2aec3e4a51d0> = <class 'failure_demo.test_attribute_multiple.<locals>.Bar'>() + E + where 1 = <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2aab6e81dbe0>.b + E + where <failure_demo.test_attribute_multiple.<locals>.Foo object at 0x2aab6e81dbe0> = <class 'failure_demo.test_attribute_multiple.<locals>.Foo'>() + E + and 2 = <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2aab6bf55fd0>.b + E + where <failure_demo.test_attribute_multiple.<locals>.Bar object at 0x2aab6bf55fd0> = <class 'failure_demo.test_attribute_multiple.<locals>.Bar'>() failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = <failure_demo.TestRaises object at 0x2aec3e4a2d68> + self = <failure_demo.TestRaises object at 0x2aab6e7849b0> def test_raises(self): s = 'qwe' @@ -358,7 +358,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 0x2aec3e4e2198> + self = <failure_demo.TestRaises object at 0x2aab6e8413c8> def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -367,7 +367,7 @@ failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = <failure_demo.TestRaises object at 0x2aec3e5017b8> + self = <failure_demo.TestRaises object at 0x2aab6e791fd0> def test_raise(self): > raise ValueError("demo error") @@ -376,7 +376,7 @@ failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = <failure_demo.TestRaises object at 0x2aec3e533160> + self = <failure_demo.TestRaises object at 0x2aab6e777f60> def test_tupleerror(self): > a,b = [1] @@ -385,7 +385,7 @@ failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = <failure_demo.TestRaises object at 0x2aec3e4cc438> + self = <failure_demo.TestRaises object at 0x2aab6e7c0390> def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -398,7 +398,7 @@ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = <failure_demo.TestRaises object at 0x2aec3e5199e8> + self = <failure_demo.TestRaises object at 0x2aab6e83dc18> def test_some_error(self): > if namenotexi: @@ -426,7 +426,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 0x2aec3e515cf8> + self = <failure_demo.TestMoreErrors object at 0x2aab6e7cd4e0> def test_complex_error(self): def f(): @@ -450,7 +450,7 @@ failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e4f7a58> + self = <failure_demo.TestMoreErrors object at 0x2aab6e80e898> def test_z1_unpack_error(self): l = [] @@ -460,7 +460,7 @@ failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e52db38> + self = <failure_demo.TestMoreErrors object at 0x2aab6e7fcef0> def test_z2_type_error(self): l = 3 @@ -470,19 +470,19 @@ failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e538a58> + self = <failure_demo.TestMoreErrors object at 0x2aab6e7efcf8> def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert <built-in method startswith of str object at 0x2aec3e501420>('456') - E + where <built-in method startswith of str object at 0x2aec3e501420> = '123'.startswith + E assert <built-in method startswith of str object at 0x2aab6e75d730>('456') + E + where <built-in method startswith of str object at 0x2aab6e75d730> = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e4f1b00> + self = <failure_demo.TestMoreErrors object at 0x2aab6e784320> def test_startswith_nested(self): def f(): @@ -490,15 +490,15 @@ def g(): return "456" > assert f().startswith(g()) - E assert <built-in method startswith of str object at 0x2aec3e501420>('456') - E + where <built-in method startswith of str object at 0x2aec3e501420> = '123'.startswith - E + where '123' = <function TestMoreErrors.test_startswith_nested.<locals>.f at 0x2aec3e5572f0>() - E + and '456' = <function TestMoreErrors.test_startswith_nested.<locals>.g at 0x2aec3e557268>() + E assert <built-in method startswith of str object at 0x2aab6e75d730>('456') + E + where <built-in method startswith of str object at 0x2aab6e75d730> = '123'.startswith + E + where '123' = <function TestMoreErrors.test_startswith_nested.<locals>.f at 0x2aab6e7e8730>() + E + and '456' = <function TestMoreErrors.test_startswith_nested.<locals>.g at 0x2aab6e7e86a8>() failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e495438> + self = <failure_demo.TestMoreErrors object at 0x2aab6e8414a8> def test_global_func(self): > assert isinstance(globf(42), float) @@ -508,18 +508,18 @@ failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e567240> + self = <failure_demo.TestMoreErrors object at 0x2aab6e75d940> def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = <failure_demo.TestMoreErrors object at 0x2aec3e567240>.x + E + where 42 = <failure_demo.TestMoreErrors object at 0x2aab6e75d940>.x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e502cc0> + self = <failure_demo.TestMoreErrors object at 0x2aab6e7c0160> def test_compare(self): > assert globf(10) < 5 @@ -529,7 +529,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = <failure_demo.TestMoreErrors object at 0x2aec3e5197f0> + self = <failure_demo.TestMoreErrors object at 0x2aab6e7dedd8> def test_try_finally(self): x = 1 @@ -538,4 +538,4 @@ E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.22 seconds ========================= + ======================== 39 failed in 0.25 seconds ========================= diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c doc/en/example/simple.txt --- a/doc/en/example/simple.txt +++ b/doc/en/example/simple.txt @@ -108,7 +108,7 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 0 items ============================= in 0.00 seconds ============================= @@ -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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-243/conftest.py:9: need --runslow option to run + SKIP [1] /tmp/doc-exec-87/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.01 seconds ==================== @@ -165,7 +165,7 @@ $ py.test --runslow =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items test_module.py .. @@ -256,7 +256,7 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 project deps: mylib-1.1 collected 0 items @@ -279,7 +279,7 @@ $ py.test -v =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 info1: did you know that ... did you? collecting ... collected 0 items @@ -290,7 +290,7 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 0 items ============================= in 0.00 seconds ============================= @@ -322,7 +322,7 @@ $ py.test --durations=3 =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 3 items test_some_are_slow.py ... @@ -383,7 +383,7 @@ $ py.test -rx =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 4 items test_step.py .Fx. @@ -391,7 +391,7 @@ ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = <test_step.TestUserHandling object at 0x2b2ef2a4feb8> + self = <test_step.TestUserHandling object at 0x2ae0c339e3c8> def test_modification(self): > assert 0 @@ -401,7 +401,7 @@ ========================= short test summary info ========================== XFAIL test_step.py::TestUserHandling::()::test_deletion reason: previous test failed (test_modification) - ============== 1 failed, 2 passed, 1 xfailed in 0.01 seconds =============== + ============== 1 failed, 2 passed, 1 xfailed in 0.02 seconds =============== We'll see that ``test_deletion`` was not executed because ``test_modification`` failed. It is reported as an "expected failure". @@ -453,7 +453,7 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 7 items test_step.py .Fx. @@ -463,17 +463,17 @@ ================================== ERRORS ================================== _______________________ ERROR at setup of test_root ________________________ - file /tmp/doc-exec-243/b/test_error.py, line 1 + file /tmp/doc-exec-87/b/test_error.py, line 1 def test_root(db): # no db here, will error out fixture 'db' not found - available fixtures: tmpdir, monkeypatch, capsys, capfd, pytestconfig, recwarn + available fixtures: recwarn, monkeypatch, pytestconfig, capfd, capsys, tmpdir use 'py.test --fixtures [testpath]' for help on them. - /tmp/doc-exec-243/b/test_error.py:1 + /tmp/doc-exec-87/b/test_error.py:1 ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = <test_step.TestUserHandling object at 0x2b63a7aec710> + self = <test_step.TestUserHandling object at 0x2ac268bf0048> def test_modification(self): > assert 0 @@ -482,23 +482,23 @@ test_step.py:9: AssertionError _________________________________ test_a1 __________________________________ - db = <conftest.DB object at 0x2b63a7b04470> + db = <conftest.DB object at 0x2ac268bf09e8> def test_a1(db): > assert 0, db # to show value - E AssertionError: <conftest.DB object at 0x2b63a7b04470> + E AssertionError: <conftest.DB object at 0x2ac268bf09e8> a/test_db.py:2: AssertionError _________________________________ test_a2 __________________________________ - db = <conftest.DB object at 0x2b63a7b04470> + db = <conftest.DB object at 0x2ac268bf09e8> def test_a2(db): > assert 0, db # to show value - E AssertionError: <conftest.DB object at 0x2b63a7b04470> + E AssertionError: <conftest.DB object at 0x2ac268bf09e8> a/test_db2.py:2: AssertionError - ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.03 seconds ========== + ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.04 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 @@ -553,7 +553,7 @@ $ py.test test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items test_module.py FF @@ -561,7 +561,7 @@ ================================= FAILURES ================================= ________________________________ test_fail1 ________________________________ - tmpdir = local('/tmp/pytest-509/test_fail10') + tmpdir = local('/tmp/pytest-15/test_fail10') def test_fail1(tmpdir): > assert 0 @@ -575,12 +575,12 @@ E assert 0 test_module.py:4: AssertionError - ========================= 2 failed in 0.02 seconds ========================= + ========================= 2 failed in 0.01 seconds ========================= you will have a "failures" file which contains the failing test ids:: $ cat failures - test_module.py::test_fail1 (/tmp/pytest-509/test_fail10) + test_module.py::test_fail1 (/tmp/pytest-15/test_fail10) test_module.py::test_fail2 Making test result information available in fixtures @@ -645,25 +645,25 @@ Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 513, in getconftestmodules return self._path2confmods[path] - KeyError: local('/tmp/doc-exec-243/test_module.py') + KeyError: local('/tmp/doc-exec-87/test_module.py') During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 537, in importconftest return self._conftestpath2mod[conftestpath] - KeyError: local('/tmp/doc-exec-243/conftest.py') + KeyError: local('/tmp/doc-exec-87/conftest.py') During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 543, in importconftest mod = conftestpath.pyimport() - File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/py/_path/local.py", line 620, in pyimport + File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/py/_path/local.py", line 640, in pyimport __import__(modname) - File "/tmp/doc-exec-243/conftest.py", line 22 + File "/tmp/doc-exec-87/conftest.py", line 22 print "setting up a test failed!", request.node.nodeid ^ SyntaxError: invalid syntax - ERROR: could not load /tmp/doc-exec-243/conftest.py + ERROR: could not load /tmp/doc-exec-87/conftest.py You'll see that the fixture finalizers could use the precise reporting @@ -719,3 +719,4 @@ application, using standard ``py.test`` command-line options:: $ ./app_main --pytest --verbose --tb=long --junit-xml=results.xml test-suite/ + /bin/sh: 1: ./app_main: not found diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c doc/en/example/special.txt --- a/doc/en/example/special.txt +++ b/doc/en/example/special.txt @@ -63,23 +63,23 @@ Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 513, in getconftestmodules return self._path2confmods[path] - KeyError: local('/tmp/doc-exec-244/test_module.py') + KeyError: local('/tmp/doc-exec-88/test_module.py') During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 537, in importconftest return self._conftestpath2mod[conftestpath] - KeyError: local('/tmp/doc-exec-244/conftest.py') + KeyError: local('/tmp/doc-exec-88/conftest.py') During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/config.py", line 543, in importconftest mod = conftestpath.pyimport() - File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/py/_path/local.py", line 620, in pyimport + File "/home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/py/_path/local.py", line 640, in pyimport __import__(modname) - File "/tmp/doc-exec-244/conftest.py", line 6 + File "/tmp/doc-exec-88/conftest.py", line 6 print "callattr_ahead_of_alltests called" ^ SyntaxError: invalid syntax - ERROR: could not load /tmp/doc-exec-244/conftest.py + ERROR: could not load /tmp/doc-exec-88/conftest.py diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.2.dev1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_smtpsimple.py F @@ -84,7 +84,7 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP object at 0x2ade77b37e48> + smtp = <smtplib.SMTP object at 0x2aed2eae9da0> 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.18 seconds ========================= + ========================= 1 failed in 0.21 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.23 -- pytest-2.6.2.dev1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 2 items test_module.py FF @@ -201,7 +201,7 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP object at 0x2b4b07e38e48> + smtp = <smtplib.SMTP object at 0x2b1a170a7240> def test_ehlo(smtp): response = smtp.ehlo() @@ -212,7 +212,7 @@ test_module.py:5: TypeError ________________________________ test_noop _________________________________ - smtp = <smtplib.SMTP object at 0x2b4b07e38e48> + smtp = <smtplib.SMTP object at 0x2b1a170a7240> def test_noop(smtp): response = smtp.noop() @@ -221,7 +221,7 @@ E assert 0 test_module.py:11: AssertionError - ========================= 2 failed in 0.18 seconds ========================= + ========================= 2 failed in 0.21 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 @@ -310,7 +310,7 @@ $ py.test -s -q --tb=no FF - 2 failed in 0.17 seconds + 2 failed in 0.16 seconds Let's quickly create another test module that actually sets the server URL in its module namespace:: @@ -377,7 +377,7 @@ ================================= FAILURES ================================= __________________________ test_ehlo[merlinux.eu] __________________________ - smtp = <smtplib.SMTP object at 0x2b824acf3e80> + smtp = <smtplib.SMTP object at 0x2abe2d35dac8> def test_ehlo(smtp): response = smtp.ehlo() @@ -388,7 +388,7 @@ test_module.py:5: TypeError __________________________ test_noop[merlinux.eu] __________________________ - smtp = <smtplib.SMTP object at 0x2b824acf3e80> + smtp = <smtplib.SMTP object at 0x2abe2d35dac8> def test_noop(smtp): response = smtp.noop() @@ -399,7 +399,7 @@ test_module.py:11: AssertionError ________________________ test_ehlo[mail.python.org] ________________________ - smtp = <smtplib.SMTP object at 0x2b824b19fb38> + smtp = <smtplib.SMTP object at 0x2abe2d35d9b0> def test_ehlo(smtp): response = smtp.ehlo() @@ -409,10 +409,10 @@ test_module.py:5: TypeError -------------------------- Captured stdout setup --------------------------- - finalizing <smtplib.SMTP object at 0x2b824acf3e80> + finalizing <smtplib.SMTP object at 0x2abe2d35dac8> ________________________ test_noop[mail.python.org] ________________________ - smtp = <smtplib.SMTP object at 0x2b824b19fb38> + smtp = <smtplib.SMTP object at 0x2abe2d35d9b0> def test_noop(smtp): response = smtp.noop() @@ -461,13 +461,13 @@ $ py.test -v test_appsetup.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.2.dev1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /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 6.11 seconds ========================= + ========================= 2 passed in 6.37 seconds ========================= Due to the parametrization of ``smtp`` the test will run twice with two different ``App`` instances and respective smtp servers. There is no @@ -525,7 +525,7 @@ $ py.test -v -s test_module.py =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.2.dev1 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 -- /home/hpk/p/pytest/.tox/regen/bin/python3.4 collecting ... collected 8 items test_module.py::test_0[1] test0 1 @@ -675,7 +675,7 @@ $ py.test -q .. - 2 passed in 0.01 seconds + 2 passed in 0.02 seconds Here is how autouse fixtures work in other scopes: diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.1, imported from /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/pytest.py + This is pytest version 2.6.2, 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,19 +49,19 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items - + test_sample.py F - + ================================= FAILURES ================================= _______________________________ test_answer ________________________________ - + def test_answer(): > assert func(3) == 5 E assert 4 == 5 E + where 4 = func(3) - + test_sample.py:5: AssertionError ========================= 1 failed in 0.01 seconds ========================= @@ -97,7 +97,7 @@ $ py.test -q test_sysexit.py . - 1 passed in 0.00 seconds + 1 passed in 0.01 seconds .. todo:: For further ways to assert exceptions see the `raises` @@ -126,16 +126,16 @@ .F ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - - self = <test_class.TestClass object at 0x2ad4b005b710> - + + self = <test_class.TestClass object at 0x2aef2750f4a8> + def test_two(self): x = "hello" > assert hasattr(x, 'check') E assert hasattr('hello', 'check') - + test_class.py:8: AssertionError - 1 failed, 1 passed in 0.01 seconds + 1 failed, 1 passed in 0.02 seconds The first test passed, the second failed. Again we can easily see the intermediate values used in the assertion, helping us to @@ -159,18 +159,21 @@ before performing the test function call. Let's just run it:: $ py.test -q test_tmpdir.py - - ================================== ERRORS ================================== - _____________________ ERROR collecting test_tmpdir.py ______________________ - /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/_pytest/python.py:463: in _importtestmodule - mod = self.fspath.pyimport(ensuresyspath=True) - /home/hpk/p/pytest/.tox/regen/lib/python3.4/site-packages/py/_path/local.py:620: in pyimport - __import__(modname) - E File "/tmp/doc-exec-187/test_tmpdir.py", line 2 - E print tmpdir - E ^ - E SyntaxError: invalid syntax - 1 error in 0.03 seconds + F + ================================= FAILURES ================================= + _____________________________ test_needsfiles ______________________________ + + tmpdir = local('/tmp/pytest-11/test_needsfiles0') + + def test_needsfiles(tmpdir): + print (tmpdir) + > assert 0 + E assert 0 + + test_tmpdir.py:3: AssertionError + --------------------------- Captured stdout call --------------------------- + /tmp/pytest-11/test_needsfiles0 + 1 failed in 0.32 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 3 items test_expectation.py ..F @@ -100,7 +100,7 @@ $ py.test =========================== test session starts ============================ - platform linux -- Python 3.4.0 -- py-1.4.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 3 items test_expectation.py ..x @@ -170,8 +170,8 @@ def test_valid_string(stringinput): > assert stringinput.isalpha() - E assert <built-in method isalpha of str object at 0x2ab7463a6b58>() - E + where <built-in method isalpha of str object at 0x2ab7463a6b58> = '!'.isalpha + E assert <built-in method isalpha of str object at 0x2adc310adb58>() + E + where <built-in method isalpha of str object at 0x2adc310adb58> = '!'.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-195/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-38/test_strings.py:1 1 skipped in 0.01 seconds For further examples, you might want to look at :ref:`more diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 7 items xfail_demo.py xxxxxxx diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 collected 1 items test_tmpdir.py F @@ -37,7 +37,7 @@ ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/tmp/pytest-506/test_create_file0') + tmpdir = local('/tmp/pytest-12/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.02 seconds ========================= + ========================= 1 failed in 0.01 seconds ========================= .. _`base temporary directory`: diff -r b2d567a5fe91815ae55b3a7354be6eb38762683f -r 16556bd3458e72e960b2a49aea319030cb119f6c 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.23 -- pytest-2.6.1 + platform linux -- Python 3.4.0 -- py-1.4.24 -- pytest-2.6.2 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 0x2b12849f90b8> + E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2ad7f12df240> test_unittest_db.py:9: AssertionError ___________________________ MyTest.test_method2 ____________________________ @@ -110,7 +110,7 @@ def test_method2(self): > assert 0, self.db # fail for demo purposes - E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2b12849f90b8> + E AssertionError: <conftest.db_class.<locals>.DummyDB object at 0x2ad7f12df240> test_unittest_db.py:12: AssertionError ========================= 2 failed in 0.05 seconds ========================= @@ -160,7 +160,7 @@ $ py.test -q test_unittest_cleandir.py . - 1 passed in 0.05 seconds + 1 passed in 0.04 seconds ... gives us one passed test because the ``initdir`` fixture function was executed ahead of the ``test_method``. https://bitbucket.org/hpk42/pytest/commits/1a64df368b27/ Changeset: 1a64df368b27 User: hpk42 Date: 2014-09-05 13:55:58 Summary: mention XXX regendoc for release process Affected #: 1 file diff -r 16556bd3458e72e960b2a49aea319030cb119f6c -r 1a64df368b2746f35ac479cad426515283b25722 HOWTORELEASE.rst --- a/HOWTORELEASE.rst +++ b/HOWTORELEASE.rst @@ -25,18 +25,21 @@ which is ok (tox does not support skipping on per-platform basis yet). -7. go to "doc/en" and upload docs with "make install" +7. XXX "regen docs" (not easy to do currently as it requires + a development version of the regendoc tool from ronny) + +8. go to "doc/en" and upload docs with "make install" (the latter requires ssh-login permissions on pytest.org because it uses rsync). Note that the "install" target of doc/en/Makefile defines where the rsync goes to, typically to the "latest" section of pytest.org. -8. publish to pypi "devpi push pytest-2.6.2 pypi:NAME" where NAME +9. publish to pypi "devpi push pytest-2.6.2 pypi:NAME" where NAME is the name of pypi.python.org as configured in your ~/.pypirc file -- it's the same you would use with "setup.py upload -r NAME" -9. send release announcement to mailing lists: +10. send release announcement to mailing lists: pytest-dev testing-in-python 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
