diff --git a/CHANGELOG b/CHANGELOG index 0d66e8765..30d7d905d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Changes between 2.2.0 and 2.2.1.dev +Changes between 2.2.0 and 2.2.1 ---------------------------------------- - fix issue99 (in pytest and py) internallerrors with resultlog now diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 70d91393b..64697fb10 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.2.1.dev5' +__version__ = '2.2.1' diff --git a/doc/announce/release-2.2.1.txt b/doc/announce/release-2.2.1.txt new file mode 100644 index 000000000..37b9bbeb0 --- /dev/null +++ b/doc/announce/release-2.2.1.txt @@ -0,0 +1,37 @@ +pytest-2.2.1: bug fixes, perfect teardowns +=========================================================================== + +pytest-2.2.1 is a minor backward-compatible release of the the py.test +testing tool. It contains bug fixes and little improvements, including +documentation fixes. For general information see here: + + http://pytest.org/ + +To install or upgrade pytest: + + pip install -U pytest # or + easy_install -U pytest + +Special thanks for helping on this release to Ronny Pfannschmidt, Jurko +Gospodnetic and Ralf Schmitt. + +best, +holger krekel + + +Changes between 2.2.0 and 2.2.1 +---------------------------------------- + +- fix issue99 (in pytest and py) internallerrors with resultlog now + produce better output - fixed by normalizing pytest_internalerror + input arguments. +- fix issue97 / traceback issues (in pytest and py) improve traceback output + in conjunction with jinja2 and cython which hack tracebacks +- fix issue93 (in pytest and pytest-xdist) avoid "delayed teardowns": + the final test in a test node will now run its teardown directly + instead of waiting for the end of the session. Thanks Dave Hunt for + the good reporting and feedback. The pytest_runtest_protocol as well + as the pytest_runtest_teardown hooks now have "nextitem" available + which will be None indicating the end of the test run. +- fix collection crash due to unknown-source collected items, thanks + to Ralf Schmitt (fixed by depending on a more recent pylib) diff --git a/doc/assert.txt b/doc/assert.txt index 2f7acdd78..d47dfe9a3 100644 --- a/doc/assert.txt +++ b/doc/assert.txt @@ -23,7 +23,7 @@ you will see the return value of the function call:: $ py.test test_assert1.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_assert1.py F @@ -105,7 +105,7 @@ if you run this module:: $ py.test test_assert2.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_assert2.py F diff --git a/doc/builtin.txt b/doc/builtin.txt index 35ef6135d..744dde54e 100644 --- a/doc/builtin.txt +++ b/doc/builtin.txt @@ -28,7 +28,7 @@ You can ask for available builtin or project-custom $ py.test --funcargs =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collected 0 items pytestconfig the pytest config object with access to command line opts. diff --git a/doc/capture.txt b/doc/capture.txt index 64f193812..a84bd8932 100644 --- a/doc/capture.txt +++ b/doc/capture.txt @@ -64,7 +64,7 @@ of the failing function and hide the other one:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items test_module.py .F @@ -78,8 +78,8 @@ of the failing function and hide the other one:: test_module.py:9: AssertionError ----------------------------- Captured stdout ------------------------------ - setting up - ==================== 1 failed, 1 passed in 0.02 seconds ==================== + setting up + ==================== 1 failed, 1 passed in 0.03 seconds ==================== Accessing captured output from a test function --------------------------------------------------- diff --git a/doc/doctest.txt b/doc/doctest.txt index 8070344b1..f2893986c 100644 --- a/doc/doctest.txt +++ b/doc/doctest.txt @@ -44,9 +44,10 @@ then you can just invoke ``py.test`` without command line options:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items mymodule.py . ========================= 1 passed in 0.05 seconds ========================= + [?1034h \ No newline at end of file diff --git a/doc/example/markers.txt b/doc/example/markers.txt index 37a019939..bce273414 100644 --- a/doc/example/markers.txt +++ b/doc/example/markers.txt @@ -25,26 +25,26 @@ You can "mark" a test function with custom metadata like this:: You can then restrict a test run to only run tests marked with ``webtest``:: $ py.test -v -m webtest - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 -- /Users/hpk/venv/1/bin/python + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python collecting ... collected 2 items test_server.py:3: test_send_http PASSED - ===================== 1 tests deselected by "-m 'webtest'" ===================== - ==================== 1 passed, 1 deselected in 0.01 seconds ==================== + =================== 1 tests deselected by "-m 'webtest'" =================== + ================== 1 passed, 1 deselected in 0.01 seconds ================== Or the inverse, running all tests except the webtest ones:: $ py.test -v -m "not webtest" - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 -- /Users/hpk/venv/1/bin/python + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python collecting ... collected 2 items test_server.py:6: test_something_quick PASSED - =================== 1 tests deselected by "-m 'not webtest'" =================== - ==================== 1 passed, 1 deselected in 0.02 seconds ==================== + ================= 1 tests deselected by "-m 'not webtest'" ================= + ================== 1 passed, 1 deselected in 0.01 seconds ================== Registering markers ------------------------------------- @@ -141,39 +141,39 @@ You can use the ``-k`` command line option to only run tests with names matching the given argument:: $ py.test -k send_http # running with the above defined examples - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 4 items test_server.py . - ===================== 3 tests deselected by '-ksend_http' ====================== - ==================== 1 passed, 3 deselected in 0.02 seconds ==================== + =================== 3 tests deselected by '-ksend_http' ==================== + ================== 1 passed, 3 deselected in 0.02 seconds ================== And you can also run all tests except the ones that match the keyword:: $ py.test -k-send_http - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 4 items test_mark_classlevel.py .. test_server.py . - ===================== 1 tests deselected by '-k-send_http' ===================== - ==================== 3 passed, 1 deselected in 0.03 seconds ==================== + =================== 1 tests deselected by '-k-send_http' =================== + ================== 3 passed, 1 deselected in 0.03 seconds ================== Or to only select the class:: $ py.test -kTestClass - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 4 items test_mark_classlevel.py .. - ===================== 2 tests deselected by '-kTestClass' ====================== - ==================== 2 passed, 2 deselected in 0.02 seconds ==================== + =================== 2 tests deselected by '-kTestClass' ==================== + ================== 2 passed, 2 deselected in 0.02 seconds ================== .. _`adding a custom marker from a plugin`: @@ -221,24 +221,24 @@ and an example invocations specifying a different environment than what the test needs:: $ py.test -E stage2 - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_someenv.py s - ========================== 1 skipped in 0.02 seconds =========================== + ======================== 1 skipped in 0.02 seconds ========================= and here is one that specifies exactly the environment needed:: $ py.test -E stage1 - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_someenv.py . - =========================== 1 passed in 0.02 seconds =========================== + ========================= 1 passed in 0.01 seconds ========================= The ``--markers`` option always gives you a list of available markers:: diff --git a/doc/example/mysetup.txt b/doc/example/mysetup.txt index 6af46566e..d68b7adb6 100644 --- a/doc/example/mysetup.txt +++ b/doc/example/mysetup.txt @@ -49,7 +49,7 @@ You can now run the test:: $ py.test test_sample.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_sample.py F @@ -57,7 +57,7 @@ You can now run the test:: ================================= FAILURES ================================= _______________________________ test_answer ________________________________ - mysetup = + mysetup = def test_answer(mysetup): app = mysetup.myapp() @@ -122,12 +122,12 @@ Running it yields:: $ py.test test_ssh.py -rs =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /Users/hpk/tmp/doc-exec-625/conftest.py:22: specify ssh host with --ssh + SKIP [1] /Users/hpk/tmp/doc-exec-44/conftest.py:22: specify ssh host with --ssh ======================== 1 skipped in 0.02 seconds ========================= diff --git a/doc/example/nonpython.txt b/doc/example/nonpython.txt index ec9d88e46..74164d633 100644 --- a/doc/example/nonpython.txt +++ b/doc/example/nonpython.txt @@ -27,7 +27,7 @@ now execute the test specification:: nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items test_simple.yml .F @@ -37,7 +37,7 @@ now execute the test specification:: 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 @@ consulted when reporting in ``verbose`` mode:: nonpython $ py.test -v =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -74,7 +74,7 @@ interesting to just look at the collection tree:: nonpython $ py.test --collectonly =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items diff --git a/doc/example/parametrize.txt b/doc/example/parametrize.txt index 17a6d1a65..419e6f9b7 100644 --- a/doc/example/parametrize.txt +++ b/doc/example/parametrize.txt @@ -154,7 +154,7 @@ this is a fully self-contained example which you can run with:: $ py.test test_scenarios.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items test_scenarios.py .. @@ -166,7 +166,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia $ py.test --collectonly test_scenarios.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items @@ -222,7 +222,7 @@ Let's first see how it looks like at collection time:: $ py.test test_backends.py --collectonly =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items @@ -238,7 +238,7 @@ And then when we run the test:: ================================= FAILURES ================================= _________________________ test_db_initialized[d2] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -295,7 +295,7 @@ argument sets to use for each test function. Let's run it:: ================================= FAILURES ================================= ________________________ TestClass.test_equals[1-2] ________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 def test_equals(self, a, b): > assert a == b @@ -326,4 +326,4 @@ Running it results in some skips if we don't have all the python interpreters in ========================= short test summary info ========================== SKIP [24] /Users/hpk/p/pytest/doc/example/multipython.py:36: 'python2.8' not found SKIP [24] /Users/hpk/p/pytest/doc/example/multipython.py:36: 'python2.4' not found - 27 passed, 48 skipped in 3.03 seconds + 27 passed, 48 skipped in 3.01 seconds diff --git a/doc/example/pythoncollection.txt b/doc/example/pythoncollection.txt index 10b19de7c..982b8e966 100644 --- a/doc/example/pythoncollection.txt +++ b/doc/example/pythoncollection.txt @@ -43,7 +43,7 @@ then the test collection looks like this:: $ py.test --collectonly =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items @@ -51,7 +51,7 @@ then the test collection looks like this:: - ============================= in 0.02 seconds ============================= + ============================= in 0.01 seconds ============================= Interpreting cmdline arguments as Python packages ----------------------------------------------------- @@ -82,7 +82,7 @@ You can always peek at the collection tree without running tests like this:: . $ py.test --collectonly pythoncollection.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 3 items diff --git a/doc/example/reportingdemo.txt b/doc/example/reportingdemo.txt index f21827c91..23d733698 100644 --- a/doc/example/reportingdemo.txt +++ b/doc/example/reportingdemo.txt @@ -13,7 +13,7 @@ get on the terminal - we are working on that): assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 39 items failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -30,7 +30,7 @@ get on the terminal - we are working on that): failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = + self = def test_simple(self): def f(): @@ -40,13 +40,13 @@ get on the terminal - we are working on that): > assert f() == g() E assert 42 == 43 - E + where 42 = () - E + and 43 = () + E + where 42 = () + E + and 43 = () failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = + self = def test_simple_multiline(self): otherfunc_multi( @@ -66,19 +66,19 @@ get on the terminal - we are working on that): failure_demo.py:11: AssertionError ___________________________ TestFailing.test_not ___________________________ - self = + self = def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = () + E + where 42 = () failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = + self = def test_eq_text(self): > assert 'spam' == 'eggs' @@ -89,7 +89,7 @@ get on the terminal - we are working on that): failure_demo.py:42: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ - self = + self = def test_eq_similar_text(self): > assert 'foo 1 bar' == 'foo 2 bar' @@ -102,7 +102,7 @@ get on the terminal - we are working on that): failure_demo.py:45: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ - self = + self = def test_eq_multiline_text(self): > assert 'foo\nspam\nbar' == 'foo\neggs\nbar' @@ -115,7 +115,7 @@ get on the terminal - we are working on that): failure_demo.py:48: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ - self = + self = def test_eq_long_text(self): a = '1'*100 + 'a' + '2'*100 @@ -132,7 +132,7 @@ get on the terminal - we are working on that): failure_demo.py:53: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ - self = + self = def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,7 +156,7 @@ get on the terminal - we are working on that): failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = + self = def test_eq_list(self): > assert [0, 1, 2] == [0, 1, 3] @@ -166,7 +166,7 @@ get on the terminal - we are working on that): failure_demo.py:61: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ - self = + self = def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -178,7 +178,7 @@ get on the terminal - we are working on that): failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ - self = + self = def test_eq_dict(self): > assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2} @@ -191,7 +191,7 @@ get on the terminal - we are working on that): failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = + self = def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -207,7 +207,7 @@ get on the terminal - we are working on that): failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = + self = def test_eq_longer_list(self): > assert [1,2] == [1,2,3] @@ -217,7 +217,7 @@ get on the terminal - we are working on that): failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = + self = def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -226,7 +226,7 @@ get on the terminal - we are working on that): failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = + self = def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -244,7 +244,7 @@ get on the terminal - we are working on that): failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = + self = def test_not_in_text_single(self): text = 'single foo line' @@ -257,7 +257,7 @@ get on the terminal - we are working on that): failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = + self = def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -270,7 +270,7 @@ get on the terminal - we are working on that): failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = + self = def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -289,7 +289,7 @@ get on the terminal - we are working on that): i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = .b + E + where 1 = .b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -299,8 +299,8 @@ get on the terminal - we are working on that): b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = .b - E + where = () + E + where 1 = .b + E + where = () failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -316,7 +316,7 @@ get on the terminal - we are working on that): failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = + self = def _get_b(self): > raise Exception('Failed to get attrib') @@ -332,15 +332,15 @@ get on the terminal - we are working on that): b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = .b - E + where = () - E + and 2 = .b - E + where = () + E + where 1 = .b + E + where = () + E + and 2 = .b + E + where = () failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = + self = def test_raises(self): s = 'qwe' @@ -352,10 +352,10 @@ get on the terminal - we are working on that): > int(s) E ValueError: invalid literal for int() with base 10: 'qwe' - <0-codegen /Users/hpk/p/pytest/_pytest/python.py:957>:1: ValueError + <0-codegen /Users/hpk/p/pytest/_pytest/python.py:958>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = + self = def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -364,7 +364,7 @@ get on the terminal - we are working on that): failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = + self = def test_raise(self): > raise ValueError("demo error") @@ -373,7 +373,7 @@ get on the terminal - we are working on that): failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = + self = def test_tupleerror(self): > a,b = [1] @@ -382,7 +382,7 @@ get on the terminal - we are working on that): failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = + self = def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -395,7 +395,7 @@ get on the terminal - we are working on that): l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = + self = def test_some_error(self): > if namenotexi: @@ -423,7 +423,7 @@ get on the terminal - we are working on that): <2-codegen 'abc-123' /Users/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ - self = + self = def test_complex_error(self): def f(): @@ -452,7 +452,7 @@ get on the terminal - we are working on that): failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = + self = def test_z1_unpack_error(self): l = [] @@ -462,7 +462,7 @@ get on the terminal - we are working on that): failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = + self = def test_z2_type_error(self): l = 3 @@ -472,19 +472,19 @@ get on the terminal - we are working on that): failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = + self = def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert ('456') - E + where = '123'.startswith + E assert ('456') + E + where = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = + self = def test_startswith_nested(self): def f(): @@ -492,15 +492,15 @@ get on the terminal - we are working on that): def g(): return "456" > assert f().startswith(g()) - E assert ('456') - E + where = '123'.startswith - E + where '123' = () - E + and '456' = () + E assert ('456') + E + where = '123'.startswith + E + where '123' = () + E + and '456' = () failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = + self = def test_global_func(self): > assert isinstance(globf(42), float) @@ -510,18 +510,18 @@ get on the terminal - we are working on that): failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = + self = def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = .x + E + where 42 = .x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = + self = def test_compare(self): > assert globf(10) < 5 @@ -531,7 +531,7 @@ get on the terminal - we are working on that): failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = + self = def test_try_finally(self): x = 1 diff --git a/doc/example/simple.txt b/doc/example/simple.txt index 9f227848d..0448cf65c 100644 --- a/doc/example/simple.txt +++ b/doc/example/simple.txt @@ -109,13 +109,13 @@ directory with the above conftest.py:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 gw0 I gw0 [0] scheduling tests via LoadScheduling - ============================= in 0.71 seconds ============================= + ============================= in 0.54 seconds ============================= .. _`excontrolskip`: @@ -156,12 +156,12 @@ and when running it will see a skipped "slow" test:: $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /Users/hpk/tmp/doc-exec-630/conftest.py:9: need --runslow option to run + SKIP [1] /Users/hpk/tmp/doc-exec-49/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.02 seconds ==================== @@ -169,12 +169,12 @@ Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 2 items test_module.py .. - ========================= 2 passed in 0.62 seconds ========================= + ========================= 2 passed in 0.02 seconds ========================= Writing well integrated assertion helpers -------------------------------------------------- @@ -261,7 +261,7 @@ which will add the string to the test header accordingly:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 project deps: mylib-1.1 collecting ... collected 0 items @@ -284,7 +284,7 @@ which will add info only when run with "--v":: $ py.test -v =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python info1: did you know that ... did you? collecting ... collected 0 items @@ -295,7 +295,7 @@ and nothing when run plainly:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 0 items ============================= in 0.00 seconds ============================= @@ -327,7 +327,7 @@ Now we can profile which test functions execute the slowest:: $ py.test --durations=3 =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 3 items test_some_are_slow.py ... diff --git a/doc/funcargs.txt b/doc/funcargs.txt index e75d77f66..6f987be1d 100644 --- a/doc/funcargs.txt +++ b/doc/funcargs.txt @@ -62,7 +62,7 @@ Running the test looks like this:: $ py.test test_simplefactory.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_simplefactory.py F @@ -77,7 +77,7 @@ Running the test looks like this:: E assert 42 == 17 test_simplefactory.py:5: AssertionError - ========================= 1 failed in 0.03 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= This means that indeed the test function was called with a ``myfuncarg`` argument value of ``42`` and the assert fails. Here is how py.test @@ -167,7 +167,7 @@ Running this will generate ten invocations of ``test_func`` passing in each of t $ py.test test_example.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 10 items test_example.py .........F @@ -190,7 +190,7 @@ Let's just look at what is collected:: $ py.test --collectonly test_example.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 10 items @@ -210,7 +210,7 @@ If you want to select only the run with the value ``7`` you could do:: $ py.test -v -k 7 test_example.py # or -k test_func[7] =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python collecting ... collected 10 items test_example.py:5: test_func[7] PASSED diff --git a/doc/getting-started.txt b/doc/getting-started.txt index 16a70b6fa..fe5106aec 100644 --- a/doc/getting-started.txt +++ b/doc/getting-started.txt @@ -22,9 +22,9 @@ Installation options:: To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.2.0, imported from /Users/hpk/p/pytest/pytest.pyc + This is py.test version 2.2.1, imported from /Users/hpk/p/pytest/pytest.pyc setuptools registered plugins: - pytest-xdist-1.7.dev1 at /Users/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-xdist-1.8.dev2 at /Users/hpk/p/pytest-xdist/xdist/plugin.pyc If you get an error checkout :ref:`installation issues`. @@ -46,7 +46,7 @@ That's it. You can execute the test function now:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_sample.py F @@ -60,7 +60,7 @@ That's it. You can execute the test function now:: E + where 4 = func(3) test_sample.py:5: AssertionError - ========================= 1 failed in 0.04 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= py.test found the ``test_answer`` function by following :ref:`standard test discovery rules `, basically detecting the ``test_`` prefixes. We got a failure report because our little ``func(3)`` call did not return ``5``. @@ -126,7 +126,7 @@ run the module by passing its filename:: ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" @@ -163,7 +163,7 @@ before performing the test function call. Let's just run it:: ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/Users/hpk/tmp/pytest-1595/test_needsfiles0') + tmpdir = local('/Users/hpk/tmp/pytest-679/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -172,8 +172,8 @@ before performing the test function call. Let's just run it:: test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /Users/hpk/tmp/pytest-1595/test_needsfiles0 - 1 failed in 0.15 seconds + /Users/hpk/tmp/pytest-679/test_needsfiles0 + 1 failed in 0.16 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff --git a/doc/monkeypatch.txt b/doc/monkeypatch.txt index cd6a6931c..8c5818c23 100644 --- a/doc/monkeypatch.txt +++ b/doc/monkeypatch.txt @@ -39,10 +39,10 @@ will be undone. .. background check: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 0 items - ============================= in 0.20 seconds ============================= + ============================= in 0.00 seconds ============================= Method reference of the monkeypatch function argument ----------------------------------------------------- diff --git a/doc/skipping.txt b/doc/skipping.txt index bc50262b5..e07ffacc2 100644 --- a/doc/skipping.txt +++ b/doc/skipping.txt @@ -130,7 +130,7 @@ Running it with the report-on-xfail option gives this output:: example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 6 items xfail_demo.py xxxxxx diff --git a/doc/tmpdir.txt b/doc/tmpdir.txt index 3453bc86a..65c19ffc0 100644 --- a/doc/tmpdir.txt +++ b/doc/tmpdir.txt @@ -28,7 +28,7 @@ Running this would result in a passed test except for the last $ py.test test_tmpdir.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_tmpdir.py F @@ -36,7 +36,7 @@ Running this would result in a passed test except for the last ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/Users/hpk/tmp/pytest-1596/test_create_file0') + tmpdir = local('/Users/hpk/tmp/pytest-680/test_create_file0') def test_create_file(tmpdir): p = tmpdir.mkdir("sub").join("hello.txt") @@ -47,7 +47,7 @@ Running this would result in a passed test except for the last E assert 0 test_tmpdir.py:7: AssertionError - ========================= 1 failed in 0.20 seconds ========================= + ========================= 1 failed in 0.17 seconds ========================= .. _`base temporary directory`: diff --git a/doc/unittest.txt b/doc/unittest.txt index 3557ebdfc..8ded344cf 100644 --- a/doc/unittest.txt +++ b/doc/unittest.txt @@ -24,7 +24,7 @@ Running it yields:: $ py.test test_unittest.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.0 + platform darwin -- Python 2.7.1 -- pytest-2.2.1 collecting ... collected 1 items test_unittest.py F @@ -42,7 +42,7 @@ Running it yields:: test_unittest.py:8: AssertionError ----------------------------- Captured stdout ------------------------------ hello - ========================= 1 failed in 0.23 seconds ========================= + ========================= 1 failed in 0.04 seconds ========================= .. _`unittest.py style`: http://docs.python.org/library/unittest.html diff --git a/setup.py b/setup.py index 10f39e7bb..026122d34 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.2.1.dev5', + version='2.2.1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -32,7 +32,7 @@ def main(): author_email='holger at merlinux.eu', entry_points= make_entry_points(), # the following should be enabled for release - install_requires=['py>=1.4.6.dev6'], + install_requires=['py>=1.4.6'], classifiers=['Development Status :: 6 - Mature', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', @@ -70,4 +70,4 @@ def make_entry_points(): return {'console_scripts': l} if __name__ == '__main__': - main() \ No newline at end of file + main()