1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/ef299e57f242/ changeset: ef299e57f242 user: hpk42 date: 2012-11-20 14:01:31 summary: fix version number, final fixes affected #: 19 files diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 _pytest/__init__.py --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.4.6' +__version__ = '2.3.4' diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/Makefile --- a/doc/en/Makefile +++ b/doc/en/Makefile @@ -12,7 +12,7 @@ PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -SITETARGET=dev +SITETARGET=latest .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/announce/release-2.3.4.txt --- a/doc/en/announce/release-2.3.4.txt +++ b/doc/en/announce/release-2.3.4.txt @@ -3,8 +3,8 @@ pytest-2.3.4 is a small stabilization release of the py.test tool which offers uebersimple assertions, scalable fixture mechanisms -and deep customization for testing with Python. The Particularly, -this release provides: +and deep customization for testing with Python. This release +comes with the following fixes and features: - make "-k" option accept an expressions the same as with "-m" so that one can write: -k "name1 or name2" etc. This is a slight usage incompatibility @@ -24,7 +24,7 @@ - fix issue91 - add/discuss package/directory level setups in example - fixes related to autouse discovery and calling -Thanks to Thomas Waldmann in particular for spotting autouse issues. +Thanks in particular to Thomas Waldmann for spotting and reporting issues. See diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_assert1.py F @@ -110,7 +110,7 @@ $ py.test test_assert2.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_assert2.py F diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/capture.txt --- a/doc/en/capture.txt +++ b/doc/en/capture.txt @@ -64,7 +64,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items test_module.py .F @@ -78,7 +78,7 @@ test_module.py:9: AssertionError ----------------------------- Captured stdout ------------------------------ - setting up <function test_func2 at 0x20e4f50> + setting up <function test_func2 at 0x1e12f50> ==================== 1 failed, 1 passed in 0.01 seconds ==================== Accessing captured output from a test function diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/doctest.txt --- a/doc/en/doctest.txt +++ b/doc/en/doctest.txt @@ -44,7 +44,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items mymodule.py . diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/example/markers.txt --- a/doc/en/example/markers.txt +++ b/doc/en/example/markers.txt @@ -28,7 +28,7 @@ $ py.test -v -m webtest =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 3 items test_server.py:3: test_send_http PASSED @@ -40,7 +40,7 @@ $ py.test -v -m "not webtest" =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 3 items test_server.py:6: test_something_quick PASSED @@ -61,7 +61,7 @@ $ py.test -v -k http # running with the above defined example module =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 3 items test_server.py:3: test_send_http PASSED @@ -73,7 +73,7 @@ $ py.test -k "not send_http" -v =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 3 items test_server.py:6: test_something_quick PASSED @@ -86,7 +86,7 @@ $ py.test -k "http or quick" -v =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 3 items test_server.py:3: test_send_http PASSED @@ -232,7 +232,7 @@ $ py.test -E stage2 =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_someenv.py s @@ -243,7 +243,7 @@ $ py.test -E stage1 =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_someenv.py . @@ -360,12 +360,12 @@ $ py.test -rs # this option reports skip reasons =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_plat.py s.s. ========================= short test summary info ========================== - SKIP [2] /tmp/doc-exec-69/conftest.py:12: cannot run on platform linux2 + SKIP [2] /tmp/doc-exec-133/conftest.py:12: cannot run on platform linux2 =================== 2 passed, 2 skipped in 0.01 seconds ==================== @@ -373,7 +373,7 @@ $ py.test -m linux2 =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_plat.py . @@ -424,7 +424,7 @@ $ py.test -m interface --tb=short =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_module.py FF @@ -445,7 +445,7 @@ $ py.test -m "interface or event" --tb=short =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_module.py FFF @@ -464,4 +464,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 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 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.10 seconds ==================== + ==================== 1 failed, 1 passed in 0.09 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -74,7 +74,7 @@ nonpython $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items <YamlFile 'test_simple.yml'><YamlItem 'ok'> diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/example/parametrize.txt --- a/doc/en/example/parametrize.txt +++ b/doc/en/example/parametrize.txt @@ -104,7 +104,7 @@ $ py.test test_scenarios.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_scenarios.py .... @@ -116,7 +116,7 @@ $ py.test --collectonly test_scenarios.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items <Module 'test_scenarios.py'><Class 'TestSampleWithScenarios'> @@ -180,7 +180,7 @@ $ py.test test_backends.py --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items <Module 'test_backends.py'><Function 'test_db_initialized[d1]'> @@ -195,7 +195,7 @@ ================================= FAILURES ================================= _________________________ test_db_initialized[d2] __________________________ - db = <conftest.DB2 instance at 0x1e49cb0> + db = <conftest.DB2 instance at 0x13cbcb0> def test_db_initialized(db): # a dummy test @@ -250,7 +250,7 @@ ================================= FAILURES ================================= ________________________ TestClass.test_equals[1-2] ________________________ - self = <test_parametrize.TestClass instance at 0x1ae4d88>, a = 1, b = 2 + self = <test_parametrize.TestClass instance at 0x24e6d88>, a = 1, b = 2 def test_equals(self, a, b): > assert a == b diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/example/pythoncollection.txt --- a/doc/en/example/pythoncollection.txt +++ b/doc/en/example/pythoncollection.txt @@ -43,7 +43,7 @@ $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items <Module 'check_myapp.py'><Class 'CheckMyApp'> @@ -82,7 +82,7 @@ . $ py.test --collectonly pythoncollection.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 3 items <Module 'pythoncollection.py'><Function 'test_function'> @@ -91,7 +91,7 @@ <Function 'test_method'><Function 'test_anothermethod'> - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= customizing test collection to find all .py files --------------------------------------------------------- @@ -135,7 +135,7 @@ $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items <Module 'pkg/module_py2.py'><Function 'test_only_on_python2'> diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 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 0x1e2a550> + self = <failure_demo.TestFailing object at 0x2ad4550> def test_simple(self): def f(): @@ -40,13 +40,13 @@ > assert f() == g() E assert 42 == 43 - E + where 42 = <function f at 0x1dd6578>() - E + and 43 = <function g at 0x1dd65f0>() + E + where 42 = <function f at 0x2a7f578>() + E + and 43 = <function g at 0x2a7f5f0>() failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = <failure_demo.TestFailing object at 0x1dd8e50> + self = <failure_demo.TestFailing object at 0x2a81e50> 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 0x1dc9b50> + self = <failure_demo.TestFailing object at 0x2a72b50> def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = <function f at 0x1dd69b0>() + E + where 42 = <function f at 0x2a7f9b0>() failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1dc5b50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a6eb50> 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 0x1e5dcd0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2b07cd0> 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 0x1dbf050> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a68050> 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 0x1e28990> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2990> 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 0x1e2cc10> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad6c10> 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 0x1dd8c50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a81c50> 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 0x1dc0f50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a69f50> 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 0x1e2bf50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad5f50> def test_eq_dict(self): > assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2} @@ -191,7 +191,7 @@ failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1e2a410> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad4410> def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -207,7 +207,7 @@ failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1e28d50> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2d50> def test_eq_longer_list(self): > assert [1,2] == [1,2,3] @@ -217,7 +217,7 @@ failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1dd8310> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a81310> def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -226,7 +226,7 @@ failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1dc07d0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a697d0> def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -244,7 +244,7 @@ failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1e2ad10> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad4d10> def test_not_in_text_single(self): text = 'single foo line' @@ -257,7 +257,7 @@ failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1e28fd0> + self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2fd0> def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -270,7 +270,7 @@ failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = <failure_demo.TestSpecialisedExplanations object at 0x1dc6410> + self = <failure_demo.TestSpecialisedExplanations object at 0x2a6f410> def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -289,7 +289,7 @@ i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x1dd8850>.b + E + where 1 = <failure_demo.Foo object at 0x2a81850>.b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -299,8 +299,8 @@ b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x1e2abd0>.b - E + where <failure_demo.Foo object at 0x1e2abd0> = <class 'failure_demo.Foo'>() + E + where 1 = <failure_demo.Foo object at 0x2ad4bd0>.b + E + where <failure_demo.Foo object at 0x2ad4bd0> = <class 'failure_demo.Foo'>() failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -316,7 +316,7 @@ failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = <failure_demo.Foo object at 0x1e286d0> + self = <failure_demo.Foo object at 0x2ad26d0> def _get_b(self): > raise Exception('Failed to get attrib') @@ -332,15 +332,15 @@ b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x1dc6f10>.b - E + where <failure_demo.Foo object at 0x1dc6f10> = <class 'failure_demo.Foo'>() - E + and 2 = <failure_demo.Bar object at 0x1dc6d50>.b - E + where <failure_demo.Bar object at 0x1dc6d50> = <class 'failure_demo.Bar'>() + E + where 1 = <failure_demo.Foo object at 0x2a6ff10>.b + E + where <failure_demo.Foo object at 0x2a6ff10> = <class 'failure_demo.Foo'>() + E + and 2 = <failure_demo.Bar object at 0x2a6fd50>.b + E + where <failure_demo.Bar object at 0x2a6fd50> = <class 'failure_demo.Bar'>() failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = <failure_demo.TestRaises instance at 0x1e4d680> + self = <failure_demo.TestRaises instance at 0x2a75c68> def test_raises(self): s = 'qwe' @@ -355,7 +355,7 @@ <0-codegen /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:851>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = <failure_demo.TestRaises instance at 0x1e353f8> + self = <failure_demo.TestRaises instance at 0x2adf3f8> def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -364,7 +364,7 @@ failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = <failure_demo.TestRaises instance at 0x1e3a8c0> + self = <failure_demo.TestRaises instance at 0x2af1830> def test_raise(self): > raise ValueError("demo error") @@ -373,7 +373,7 @@ failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = <failure_demo.TestRaises instance at 0x1e481b8> + self = <failure_demo.TestRaises instance at 0x2ae5290> def test_tupleerror(self): > a,b = [1] @@ -382,7 +382,7 @@ failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = <failure_demo.TestRaises instance at 0x1e48bd8> + self = <failure_demo.TestRaises instance at 0x2ae2878> def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -395,7 +395,7 @@ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = <failure_demo.TestRaises instance at 0x1dbe950> + self = <failure_demo.TestRaises instance at 0x2af0e18> def test_some_error(self): > if namenotexi: @@ -423,7 +423,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 instance at 0x1e31c68> + self = <failure_demo.TestMoreErrors instance at 0x2adbc68> def test_complex_error(self): def f(): @@ -452,7 +452,7 @@ failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = <failure_demo.TestMoreErrors instance at 0x1e31290> + self = <failure_demo.TestMoreErrors instance at 0x2aee1b8> def test_z1_unpack_error(self): l = [] @@ -462,7 +462,7 @@ failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = <failure_demo.TestMoreErrors instance at 0x1e38cf8> + self = <failure_demo.TestMoreErrors instance at 0x2ae27a0> def test_z2_type_error(self): l = 3 @@ -472,19 +472,19 @@ failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = <failure_demo.TestMoreErrors instance at 0x1e37950> + self = <failure_demo.TestMoreErrors instance at 0x2ae1128> def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert <built-in method startswith of str object at 0x1e32918>('456') - E + where <built-in method startswith of str object at 0x1e32918> = '123'.startswith + E assert <built-in method startswith of str object at 0x2adc918>('456') + E + where <built-in method startswith of str object at 0x2adc918> = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = <failure_demo.TestMoreErrors instance at 0x1e26950> + self = <failure_demo.TestMoreErrors instance at 0x2c720e0> def test_startswith_nested(self): def f(): @@ -492,15 +492,15 @@ def g(): return "456" > assert f().startswith(g()) - E assert <built-in method startswith of str object at 0x1e32918>('456') - E + where <built-in method startswith of str object at 0x1e32918> = '123'.startswith - E + where '123' = <function f at 0x1e4bb90>() - E + and '456' = <function g at 0x1e4bc08>() + E assert <built-in method startswith of str object at 0x2adc918>('456') + E + where <built-in method startswith of str object at 0x2adc918> = '123'.startswith + E + where '123' = <function f at 0x2af5b90>() + E + and '456' = <function g at 0x2af5c08>() failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = <failure_demo.TestMoreErrors instance at 0x1fc8908> + self = <failure_demo.TestMoreErrors instance at 0x2c725f0> def test_global_func(self): > assert isinstance(globf(42), float) @@ -510,18 +510,18 @@ failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = <failure_demo.TestMoreErrors instance at 0x1e47908> + self = <failure_demo.TestMoreErrors instance at 0x2a67ab8> def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = <failure_demo.TestMoreErrors instance at 0x1e47908>.x + E + where 42 = <failure_demo.TestMoreErrors instance at 0x2a67ab8>.x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = <failure_demo.TestMoreErrors instance at 0x1dd0170> + self = <failure_demo.TestMoreErrors instance at 0x2af8710> def test_compare(self): > assert globf(10) < 5 @@ -531,7 +531,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = <failure_demo.TestMoreErrors instance at 0x1e34b48> + self = <failure_demo.TestMoreErrors instance at 0x2af03f8> def test_try_finally(self): x = 1 @@ -540,4 +540,4 @@ E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.23 seconds ========================= + ======================== 39 failed in 0.25 seconds ========================= diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/example/simple.txt --- a/doc/en/example/simple.txt +++ b/doc/en/example/simple.txt @@ -106,7 +106,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 0 items ============================= in 0.00 seconds ============================= @@ -150,12 +150,12 @@ $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-74/conftest.py:9: need --runslow option to run + SKIP [1] /tmp/doc-exec-138/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.01 seconds ==================== @@ -163,7 +163,7 @@ $ py.test --runslow =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items test_module.py .. @@ -253,7 +253,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 project deps: mylib-1.1 collected 0 items @@ -276,7 +276,7 @@ $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python info1: did you know that ... did you? collecting ... collected 0 items @@ -287,7 +287,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 0 items ============================= in 0.00 seconds ============================= @@ -319,7 +319,7 @@ $ py.test --durations=3 =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 3 items test_some_are_slow.py ... @@ -380,7 +380,7 @@ $ py.test -rx =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 4 items test_step.py .Fx. @@ -388,7 +388,7 @@ ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = <test_step.TestUserHandling instance at 0x2d82c68> + self = <test_step.TestUserHandling instance at 0x193bc68> def test_modification(self): > assert 0 @@ -398,7 +398,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". @@ -450,7 +450,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 7 items test_step.py .Fx. @@ -460,17 +460,17 @@ ================================== ERRORS ================================== _______________________ ERROR at setup of test_root ________________________ - file /tmp/doc-exec-74/b/test_error.py, line 1 + file /tmp/doc-exec-138/b/test_error.py, line 1 def test_root(db): # no db here, will error out fixture 'db' not found available fixtures: pytestconfig, recwarn, monkeypatch, capfd, capsys, tmpdir use 'py.test --fixtures [testpath]' for help on them. - /tmp/doc-exec-74/b/test_error.py:1 + /tmp/doc-exec-138/b/test_error.py:1 ================================= FAILURES ================================= ____________________ TestUserHandling.test_modification ____________________ - self = <test_step.TestUserHandling instance at 0xefad88> + self = <test_step.TestUserHandling instance at 0x1492d88> def test_modification(self): > assert 0 @@ -479,23 +479,23 @@ test_step.py:9: AssertionError _________________________________ test_a1 __________________________________ - db = <conftest.DB instance at 0xf00e60> + db = <conftest.DB instance at 0x1498e60> def test_a1(db): > assert 0, db # to show value - E AssertionError: <conftest.DB instance at 0xf00e60> + E AssertionError: <conftest.DB instance at 0x1498e60> a/test_db.py:2: AssertionError _________________________________ test_a2 __________________________________ - db = <conftest.DB instance at 0xf00e60> + db = <conftest.DB instance at 0x1498e60> def test_a2(db): > assert 0, db # to show value - E AssertionError: <conftest.DB instance at 0xf00e60> + E AssertionError: <conftest.DB instance at 0x1498e60> 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 @@ -550,7 +550,7 @@ $ py.test test_module.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items test_module.py FF @@ -558,7 +558,7 @@ ================================= FAILURES ================================= ________________________________ test_fail1 ________________________________ - tmpdir = local('/tmp/pytest-376/test_fail10') + tmpdir = local('/tmp/pytest-543/test_fail10') def test_fail1(tmpdir): > assert 0 @@ -577,7 +577,7 @@ you will have a "failures" file which contains the failing test ids:: $ cat failures - test_module.py::test_fail1 (/tmp/pytest-376/test_fail10) + test_module.py::test_fail1 (/tmp/pytest-543/test_fail10) test_module.py::test_fail2 Making test result information available in fixtures @@ -640,7 +640,7 @@ $ py.test -s test_module.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 3 items test_module.py EFF diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/fixture.txt --- a/doc/en/fixture.txt +++ b/doc/en/fixture.txt @@ -71,7 +71,7 @@ $ py.test test_smtpsimple.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_smtpsimple.py F @@ -79,7 +79,7 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP instance at 0x160eab8> + smtp = <smtplib.SMTP instance at 0x236cab8> def test_ehlo(smtp): response, msg = smtp.ehlo() @@ -89,7 +89,7 @@ E assert 0 test_smtpsimple.py:12: AssertionError - ========================= 1 failed in 0.23 seconds ========================= + ========================= 1 failed in 0.17 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 @@ -189,7 +189,7 @@ $ py.test test_module.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 2 items test_module.py FF @@ -197,7 +197,7 @@ ================================= FAILURES ================================= ________________________________ test_ehlo _________________________________ - smtp = <smtplib.SMTP instance at 0x146ddd0> + smtp = <smtplib.SMTP instance at 0x1c9add0> def test_ehlo(smtp): response = smtp.ehlo() @@ -209,7 +209,7 @@ test_module.py:6: AssertionError ________________________________ test_noop _________________________________ - smtp = <smtplib.SMTP instance at 0x146ddd0> + smtp = <smtplib.SMTP instance at 0x1c9add0> def test_noop(smtp): response = smtp.noop() @@ -218,7 +218,7 @@ E assert 0 test_module.py:11: AssertionError - ========================= 2 failed in 0.19 seconds ========================= + ========================= 2 failed in 0.23 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 @@ -271,7 +271,7 @@ $ py.test -s -q --tb=no FF - finalizing <smtplib.SMTP instance at 0x1fc4290> + finalizing <smtplib.SMTP instance at 0x2720290> We see that the ``smtp`` instance is finalized after the two tests using it tests executed. If we had specified ``scope='function'`` @@ -342,7 +342,7 @@ ================================= FAILURES ================================= __________________________ test_ehlo[merlinux.eu] __________________________ - smtp = <smtplib.SMTP instance at 0x1b5e368> + smtp = <smtplib.SMTP instance at 0x1dae368> def test_ehlo(smtp): response = smtp.ehlo() @@ -354,7 +354,7 @@ test_module.py:6: AssertionError __________________________ test_noop[merlinux.eu] __________________________ - smtp = <smtplib.SMTP instance at 0x1b5e368> + smtp = <smtplib.SMTP instance at 0x1dae368> def test_noop(smtp): response = smtp.noop() @@ -365,7 +365,7 @@ test_module.py:11: AssertionError ________________________ test_ehlo[mail.python.org] ________________________ - smtp = <smtplib.SMTP instance at 0x1b6c7a0> + smtp = <smtplib.SMTP instance at 0x1dbc7a0> def test_ehlo(smtp): response = smtp.ehlo() @@ -376,7 +376,7 @@ test_module.py:5: AssertionError ________________________ test_noop[mail.python.org] ________________________ - smtp = <smtplib.SMTP instance at 0x1b6c7a0> + smtp = <smtplib.SMTP instance at 0x1dbc7a0> def test_noop(smtp): response = smtp.noop() @@ -424,13 +424,13 @@ $ py.test -v test_appsetup.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 2 items test_appsetup.py:12: test_smtp_exists[merlinux.eu] PASSED test_appsetup.py:12: test_smtp_exists[mail.python.org] PASSED - ========================= 2 passed in 5.82 seconds ========================= + ========================= 2 passed in 5.95 seconds ========================= Due to the parametrization of ``smtp`` the test will run twice with two different ``App`` instances and respective smtp servers. There is no @@ -489,7 +489,7 @@ $ py.test -v -s test_module.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 -- /home/hpk/p/pytest/.tox/regen/bin/python + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python collecting ... collected 8 items test_module.py:16: test_0[1] PASSED diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/getting-started.txt --- a/doc/en/getting-started.txt +++ b/doc/en/getting-started.txt @@ -23,7 +23,7 @@ To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.4.6, imported from /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/pytest.pyc + This is py.test version 2.3.4, imported from /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/pytest.pyc If you get an error checkout :ref:`installation issues`. @@ -45,7 +45,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_sample.py F @@ -122,7 +122,7 @@ ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = <test_class.TestClass instance at 0x2308e18> + self = <test_class.TestClass instance at 0x2418e18> def test_two(self): x = "hello" @@ -157,7 +157,7 @@ ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-372/test_needsfiles0') + tmpdir = local('/tmp/pytest-539/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -166,7 +166,7 @@ test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /tmp/pytest-372/test_needsfiles0 + /tmp/pytest-539/test_needsfiles0 Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/parametrize.txt --- a/doc/en/parametrize.txt +++ b/doc/en/parametrize.txt @@ -53,7 +53,7 @@ $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 3 items test_expectation.py ..F @@ -135,8 +135,8 @@ def test_valid_string(stringinput): > assert stringinput.isalpha() - E assert <built-in method isalpha of str object at 0x2b8b7d243fa8>() - E + where <built-in method isalpha of str object at 0x2b8b7d243fa8> = '!'.isalpha + E assert <built-in method isalpha of str object at 0x2b2319ceffa8>() + E + where <built-in method isalpha of str object at 0x2b2319ceffa8> = '!'.isalpha test_strings.py:3: AssertionError @@ -149,7 +149,7 @@ $ py.test -q -rs test_strings.py s ========================= short test summary info ========================== - SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:962: got empty parameter set, function test_valid_string at /tmp/doc-exec-36/test_strings.py:1 + SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:962: got empty parameter set, function test_valid_string at /tmp/doc-exec-101/test_strings.py:1 For further examples, you might want to look at :ref:`more parametrization examples <paramexamples>`. diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 doc/en/skipping.txt --- a/doc/en/skipping.txt +++ b/doc/en/skipping.txt @@ -132,7 +132,7 @@ example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 6 items xfail_demo.py xxxxxx diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.4 collected 1 items test_tmpdir.py F @@ -37,7 +37,7 @@ ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/tmp/pytest-373/test_create_file0') + tmpdir = local('/tmp/pytest-540/test_create_file0') def test_create_file(tmpdir): p = tmpdir.mkdir("sub").join("hello.txt") diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 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 linux2 -- Python 2.7.3 -- pytest-2.4.6 + platform linux2 -- Python 2.7.3 -- pytest-2.3.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.DummyDB instance at 0x229e7e8> + E AssertionError: <conftest.DummyDB instance at 0x19be7e8> 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.DummyDB instance at 0x229e7e8> + E AssertionError: <conftest.DummyDB instance at 0x19be7e8> test_unittest_db.py:12: AssertionError ========================= 2 failed in 0.02 seconds ========================= diff -r 048679527ddceceae072f7df48a170b40a3ba918 -r ef299e57f24218dbdd949498d7e660723636bcc3 setup.py --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.4.6', + version='2.3.4', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], 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. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
