diff --git a/CHANGELOG b/CHANGELOG index ca16edbbc..b4770b7ff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ -Changes between 2.1.2 and [next version] +Changes between 2.1.2 and 2.1.3 ---------------------------------------- -- fix issue79: rewriting failed on some comparisons in boolops +- fix issue79: assertion rewriting failed on some comparisons in boolops - correctly handle zero length arguments (a la pytest '') - fix issue67 / junitxml now contains correct test durations, thanks ronny - fix issue75 / skipping test failure on jython diff --git a/ISSUES.txt b/ISSUES.txt index 7f66cafa5..5e683c769 100644 --- a/ISSUES.txt +++ b/ISSUES.txt @@ -7,6 +7,13 @@ tags: bug 2.4 core xdist the protocol now - setup/teardown is called at module level. consider making calling of setup/teardown configurable +optimizations +--------------------------------------------------------------- +tags: 2.4 core + +- look at ihook optimization such that all lookups for + hooks relating to the same fspath are cached. + fix start/finish partial finailization problem --------------------------------------------------------------- tags: bug core diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 001cc9ec7..adeaf25bf 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.1.3dev1' +__version__ = '2.1.3' diff --git a/doc/announce/release-2.1.3.txt b/doc/announce/release-2.1.3.txt new file mode 100644 index 000000000..9300398f2 --- /dev/null +++ b/doc/announce/release-2.1.3.txt @@ -0,0 +1,32 @@ +py.test 2.1.3: just some more fixes +=========================================================================== + +pytest-2.1.3 is a minor backward compatible maintenance release of the +popular py.test testing tool. It is commonly used for unit, functional- +and integration testing. See extensive docs with examples here: + + http://pytest.org/ + +The release contains another fix to the perfected assertions introduced +with the 2.1 series as well as the new possibility to customize reporting +for assertion expressions on a per-directory level. + +If you want to install or upgrade pytest, just type one of:: + + pip install -U pytest # or + easy_install -U pytest + +Thanks to the bug reporters and to Ronny Pfannschmidt, Benjamin Peterson +and who implemented the fixes. + +best, +holger krekel + +Changes between 2.1.2 and 2.1.3 +---------------------------------------- + +- fix issue79: assertion rewriting failed on some comparisons in boolops, +- correctly handle zero length arguments (a la pytest '') +- fix issue67 / junitxml now contains correct test durations +- fix issue75 / skipping test failure on jython +- fix issue77 / Allow assertrepr_compare hook to apply to a subset of tests diff --git a/doc/assert.txt b/doc/assert.txt index 6107be892..52ded8ff6 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_assert1.py F @@ -37,7 +37,7 @@ you will see the return value of the function call:: E + where 3 = f() test_assert1.py:5: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.03 seconds ========================= py.test has support for showing the values of the most common subexpressions including calls, attributes, comparisons, and binary and unary @@ -105,7 +105,7 @@ if you run this module:: $ py.test test_assert2.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_assert2.py F @@ -124,7 +124,7 @@ if you run this module:: E '5' test_assert2.py:5: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= Special comparisons are done for a number of cases: @@ -181,7 +181,7 @@ the conftest file:: E vals: 1 != 2 test_foocompare.py:8: AssertionError - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds .. _assert-details: .. _`assert introspection`: diff --git a/doc/builtin.txt b/doc/builtin.txt index f6270f3ac..ebee125ef 100644 --- a/doc/builtin.txt +++ b/doc/builtin.txt @@ -25,7 +25,7 @@ You can ask for available builtin or project-custom $ py.test --funcargs =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collected 0 items pytestconfig the pytest config object with access to command line opts. @@ -72,5 +72,7 @@ You can ask for available builtin or project-custom See http://docs.python.org/library/warnings.html for information on warning categories. + cov + A pytest funcarg that provides access to the underlying coverage object. ============================= in 0.00 seconds ============================= diff --git a/doc/capture.txt b/doc/capture.txt index 8110211ca..4739585be 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.01 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 c11ba3493..8b065bd06 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items mymodule.py . - ========================= 1 passed in 0.02 seconds ========================= + ========================= 1 passed in 0.06 seconds ========================= + [?1034h \ No newline at end of file diff --git a/doc/example/mysetup.txt b/doc/example/mysetup.txt index 7731ec321..c6a454e5e 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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() @@ -66,7 +66,7 @@ You can now run the test:: E assert 54 == 42 test_sample.py:4: AssertionError - ========================= 1 failed in 0.01 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= This means that our ``mysetup`` object was successfully instantiated and ``mysetup.app()`` returned an initialized ``MyApp`` instance. @@ -122,14 +122,14 @@ Running it yields:: $ py.test test_ssh.py -rs =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-296/conftest.py:22: specify ssh host with --ssh + SKIP [1] /Users/hpk/tmp/doc-exec-167/conftest.py:22: specify ssh host with --ssh - ======================== 1 skipped in 0.01 seconds ========================= + ======================== 1 skipped in 0.02 seconds ========================= If you specify a command line option like ``py.test --ssh=python.org`` the test will execute as expected. diff --git a/doc/example/nonpython.txt b/doc/example/nonpython.txt index 7729497a1..9e92c2899 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.07 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 @@ reporting in ``verbose`` mode:: nonpython $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/hpk/venv/0/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -67,17 +67,17 @@ reporting in ``verbose`` mode:: usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.06 seconds ==================== + ==================== 1 failed, 1 passed in 0.09 seconds ==================== While developing your custom test collection and execution it's also interesting to just look at the collection tree:: nonpython $ py.test --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items - ============================= in 0.06 seconds ============================= + ============================= in 0.08 seconds ============================= diff --git a/doc/example/parametrize.txt b/doc/example/parametrize.txt index 59a49ece3..983733723 100644 --- a/doc/example/parametrize.txt +++ b/doc/example/parametrize.txt @@ -44,7 +44,7 @@ This means that we only run 2 tests if we do not pass ``--all``:: $ py.test -q test_compute.py collecting ... collected 2 items .. - 2 passed in 0.01 seconds + 2 passed in 0.02 seconds We run only two computations, so we see two dots. let's run the full monty:: @@ -62,7 +62,7 @@ let's run the full monty:: E assert 4 < 4 test_compute.py:3: AssertionError - 1 failed, 4 passed in 0.01 seconds + 1 failed, 4 passed in 0.03 seconds As expected when running the full range of ``param1`` values we'll get an error on the last one. @@ -114,13 +114,13 @@ Let's first see how it looks like at collection time:: $ py.test test_backends.py --collectonly =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= And then when we run the test:: @@ -130,7 +130,7 @@ And then when we run the test:: ================================= FAILURES ================================= __________________________ test_db_initialized[1] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -139,7 +139,7 @@ And then when we run the test:: E Failed: deliberately failing for demo purposes test_backends.py:6: Failed - 1 failed, 1 passed in 0.01 seconds + 1 failed, 1 passed in 0.02 seconds Now you see that one invocation of the test passes and another fails, as it to be expected. @@ -184,7 +184,7 @@ the respective settings:: ================================= FAILURES ================================= __________________________ test_db_initialized[1] __________________________ - db = + db = def test_db_initialized(db): # a dummy test @@ -195,7 +195,7 @@ the respective settings:: test_backends.py:6: Failed _________________________ TestClass.test_equals[0] _________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 def test_equals(self, a, b): > assert a == b @@ -204,14 +204,14 @@ the respective settings:: test_parametrize.py:17: AssertionError ______________________ TestClass.test_zerodivision[1] ______________________ - self = , a = 3, b = 2 + self = , a = 3, b = 2 def test_zerodivision(self, a, b): > pytest.raises(ZeroDivisionError, "a/b") E Failed: DID NOT RAISE test_parametrize.py:20: Failed - 3 failed, 3 passed in 0.02 seconds + 3 failed, 3 passed in 0.05 seconds Parametrizing test methods through a decorator -------------------------------------------------------------- @@ -252,7 +252,7 @@ Running it gives similar results as before:: ================================= FAILURES ================================= _________________________ TestClass.test_equals[0] _________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 @params([dict(a=1, b=2), dict(a=3, b=3), ]) def test_equals(self, a, b): @@ -262,7 +262,7 @@ Running it gives similar results as before:: test_parametrize2.py:19: AssertionError ______________________ TestClass.test_zerodivision[1] ______________________ - self = , a = 3, b = 2 + self = , a = 3, b = 2 @params([dict(a=1, b=0), dict(a=3, b=2)]) def test_zerodivision(self, a, b): @@ -270,7 +270,7 @@ Running it gives similar results as before:: E Failed: DID NOT RAISE test_parametrize2.py:23: Failed - 2 failed, 2 passed in 0.02 seconds + 2 failed, 2 passed in 0.04 seconds Checking serialization between Python interpreters -------------------------------------------------------------- @@ -290,5 +290,5 @@ Running it (with Python-2.4 through to Python2.7 installed):: . $ py.test -q multipython.py collecting ... collected 75 items - ....s....s....s....ssssss....s....s....s....ssssss....s....s....s....ssssss - 48 passed, 27 skipped in 2.48 seconds + ssssss...ss...ss...ssssssssssss...ss...ss...ssssssssssss...ss...ss...ssssss + 27 passed, 48 skipped in 3.04 seconds diff --git a/doc/example/pythoncollection.txt b/doc/example/pythoncollection.txt index 22b20f864..133a66b00 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items @@ -51,7 +51,7 @@ then the test collection looks like this:: - ============================= in 0.01 seconds ============================= + ============================= in 0.02 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 3 items diff --git a/doc/example/reportingdemo.txt b/doc/example/reportingdemo.txt index 48680faa5..1de839c55 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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 /home/hpk/p/pytest/_pytest/python.py:833>:1: ValueError + <0-codegen /Users/hpk/p/pytest/_pytest/python.py:833>: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: @@ -420,10 +420,10 @@ get on the terminal - we are working on that): > assert 1 == 0 E assert 1 == 0 - <2-codegen 'abc-123' /home/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError + <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 @@ -540,4 +540,4 @@ get on the terminal - we are working on that): E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.20 seconds ========================= + ======================== 39 failed in 0.39 seconds ========================= diff --git a/doc/example/simple.txt b/doc/example/simple.txt index 3bdbc0479..5aae66511 100644 --- a/doc/example/simple.txt +++ b/doc/example/simple.txt @@ -53,7 +53,7 @@ Let's run this without supplying our new command line option:: test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ first - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds And now with supplying a command line option:: @@ -76,7 +76,7 @@ And now with supplying a command line option:: test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ second - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds Ok, this completes the basic pattern. However, one often rather wants to process command line options outside of the test and @@ -109,13 +109,13 @@ directory with the above conftest.py:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 - gw0 I / gw1 I - gw0 [0] / gw1 [0] + platform darwin -- Python 2.7.1 -- pytest-2.1.3 + gw0 I + gw0 [0] scheduling tests via LoadScheduling - ============================= in 0.26 seconds ============================= + ============================= in 0.48 seconds ============================= .. _`excontrolskip`: @@ -156,25 +156,25 @@ 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-301/conftest.py:9: need --runslow option to run + SKIP [1] /Users/hpk/tmp/doc-exec-172/conftest.py:9: need --runslow option to run - =================== 1 passed, 1 skipped in 0.01 seconds ==================== + =================== 1 passed, 1 skipped in 0.02 seconds ==================== Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 2 items test_module.py .. - ========================= 2 passed in 0.01 seconds ========================= + ========================= 2 passed in 0.02 seconds ========================= Writing well integrated assertion helpers -------------------------------------------------- @@ -213,7 +213,7 @@ Let's run our little function:: E Failed: not configured: 42 test_checkconfig.py:8: Failed - 1 failed in 0.01 seconds + 1 failed in 0.02 seconds Detect if running from within a py.test run -------------------------------------------------------------- @@ -261,7 +261,7 @@ which will add the string to the test header accordingly:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/hpk/venv/0/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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 0 items ============================= in 0.00 seconds ============================= diff --git a/doc/funcargs.txt b/doc/funcargs.txt index c00058293..489827cd5 100644 --- a/doc/funcargs.txt +++ b/doc/funcargs.txt @@ -61,7 +61,7 @@ Running the test looks like this:: $ py.test test_simplefactory.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_simplefactory.py F @@ -76,7 +76,7 @@ Running the test looks like this:: E assert 42 == 17 test_simplefactory.py:5: AssertionError - ========================= 1 failed in 0.01 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:: $ py.test test_example.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 10 items test_example.py .........F @@ -182,7 +182,7 @@ Running this:: E assert 9 < 9 test_example.py:7: AssertionError - ==================== 1 failed, 9 passed in 0.02 seconds ==================== + ==================== 1 failed, 9 passed in 0.04 seconds ==================== Note that the ``pytest_generate_tests(metafunc)`` hook is called during the test collection phase which is separate from the actual test running. @@ -190,7 +190,7 @@ Let's just look at what is collected:: $ py.test --collectonly test_example.py =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 10 items @@ -204,19 +204,37 @@ Let's just look at what is collected:: - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 -- /home/hpk/venv/0/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.1.3 -- /Users/hpk/venv/0/bin/python collecting ... collected 10 items + test_example.py:6: test_func[0] PASSED + test_example.py:6: test_func[1] PASSED + test_example.py:6: test_func[2] PASSED + test_example.py:6: test_func[3] PASSED + test_example.py:6: test_func[4] PASSED + test_example.py:6: test_func[5] PASSED + test_example.py:6: test_func[6] PASSED test_example.py:6: test_func[7] PASSED + test_example.py:6: test_func[8] PASSED + test_example.py:6: test_func[9] FAILED - ======================== 9 tests deselected by '7' ========================= - ================== 1 passed, 9 deselected in 0.01 seconds ================== + ================================= FAILURES ================================= + _______________________________ test_func[9] _______________________________ + + numiter = 9 + + def test_func(numiter): + > assert numiter < 9 + E assert 9 < 9 + + test_example.py:7: AssertionError + ==================== 1 failed, 9 passed in 0.05 seconds ==================== You might want to look at :ref:`more parametrization examples `. diff --git a/doc/getting-started.txt b/doc/getting-started.txt index 2e10967dc..4269124b3 100644 --- a/doc/getting-started.txt +++ b/doc/getting-started.txt @@ -22,9 +22,10 @@ Installation options:: To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.1.1, imported from /home/hpk/p/pytest/pytest.py + This is py.test version 2.1.3, imported from /Users/hpk/p/pytest/pytest.pyc setuptools registered plugins: - pytest-xdist-1.6 at /home/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-cov-1.4 at /Users/hpk/venv/0/lib/python2.7/site-packages/pytest_cov.pyc + pytest-xdist-1.6 at /Users/hpk/venv/0/lib/python2.7/site-packages/xdist/plugin.pyc If you get an error checkout :ref:`installation issues`. @@ -46,7 +47,7 @@ That's it. You can execute the test function now:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 1 items test_sample.py F @@ -60,7 +61,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.01 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``. @@ -95,7 +96,7 @@ Running it with, this time in "quiet" reporting mode:: $ py.test -q test_sysexit.py collecting ... collected 1 items . - 1 passed in 0.00 seconds + 1 passed in 0.01 seconds .. todo:: For further ways to assert exceptions see the `raises` @@ -126,7 +127,7 @@ run the module by passing its filename:: ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" @@ -134,7 +135,7 @@ run the module by passing its filename:: E assert hasattr('hello', 'check') test_class.py:8: AssertionError - 1 failed, 1 passed in 0.01 seconds + 1 failed, 1 passed in 0.03 seconds The first test passed, the second failed. Again we can easily see the intermediate values used in the assertion, helping us to @@ -163,7 +164,7 @@ before performing the test function call. Let's just run it:: ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-60/test_needsfiles0') + tmpdir = local('/Users/hpk/tmp/pytest-93/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -172,8 +173,8 @@ before performing the test function call. Let's just run it:: test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /tmp/pytest-60/test_needsfiles0 - 1 failed in 0.02 seconds + /Users/hpk/tmp/pytest-93/test_needsfiles0 + 1 failed in 0.04 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff --git a/doc/mark.txt b/doc/mark.txt index 382abacf1..ffd2c6861 100644 --- a/doc/mark.txt +++ b/doc/mark.txt @@ -88,35 +88,35 @@ You can use the ``-k`` command line option to select tests:: $ py.test -k webtest # running with the above defined examples yields =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items test_mark.py .. test_mark_classlevel.py .. - ========================= 4 passed in 0.01 seconds ========================= + ========================= 4 passed in 0.03 seconds ========================= And you can also run all tests except the ones that match the keyword:: $ py.test -k-webtest =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items ===================== 4 tests deselected by '-webtest' ===================== - ======================= 4 deselected in 0.01 seconds ======================= + ======================= 4 deselected in 0.02 seconds ======================= Or to only select the class:: $ py.test -kTestClass =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 4 items test_mark_classlevel.py .. ==================== 2 tests deselected by 'TestClass' ===================== - ================== 2 passed, 2 deselected in 0.01 seconds ================== + ================== 2 passed, 2 deselected in 0.02 seconds ================== API reference for mark related objects ------------------------------------------------ diff --git a/doc/monkeypatch.txt b/doc/monkeypatch.txt index fc433f311..0b7b5142c 100644 --- a/doc/monkeypatch.txt +++ b/doc/monkeypatch.txt @@ -39,7 +39,7 @@ will be undone. .. background check: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 0 items ============================= in 0.00 seconds ============================= diff --git a/doc/projects.txt b/doc/projects.txt index 78fa59c8e..95e577d35 100644 --- a/doc/projects.txt +++ b/doc/projects.txt @@ -46,7 +46,7 @@ Some organisations using py.test * `Some Mozilla QA people `_ use pytest to distribute their Selenium tests * `Tandberg `_ * `Shootq `_ -* `Stups department of Heinrich Heine University Düsseldorf `_ +* `Stups department of Heinrich Heine University Duesseldorf `_ * `cellzome `_ * `Open End, Gothenborg `_ * `Laboraratory of Bioinformatics, Warsaw `_ diff --git a/doc/skipping.txt b/doc/skipping.txt index 5cde61183..3144ce321 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 collecting ... collected 6 items xfail_demo.py xxxxxx @@ -147,7 +147,7 @@ Running it with the report-on-xfail option gives this output:: XFAIL xfail_demo.py::test_hello6 reason: reason - ======================== 6 xfailed in 0.03 seconds ========================= + ======================== 6 xfailed in 0.11 seconds ========================= .. _`evaluation of skipif/xfail conditions`: diff --git a/doc/tmpdir.txt b/doc/tmpdir.txt index 17de13eab..6d8b00d4e 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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('/tmp/pytest-61/test_create_file0') + tmpdir = local('/Users/hpk/tmp/pytest-94/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.03 seconds ========================= + ========================= 1 failed in 0.05 seconds ========================= .. _`base temporary directory`: diff --git a/doc/unittest.txt b/doc/unittest.txt index c61826091..567754c59 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 linux2 -- Python 2.7.1 -- pytest-2.1.1 + platform darwin -- Python 2.7.1 -- pytest-2.1.3 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.02 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 6bbb335fc..1919362ef 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.1.3dev1', + version='2.1.3', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],