From 35b0b376f063d783f9937563f92180ef47ed1a46 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Thu, 3 Feb 2011 15:14:50 +0100 Subject: [PATCH] bumping version to pytest-2.0.1, regen docs and examples --- CHANGELOG | 4 +- doc/assert.txt | 4 +- doc/capture.txt | 6 +- doc/doctest.txt | 4 +- doc/example/mysetup.txt | 8 +- doc/example/nonpython.txt | 8 +- doc/example/parametrize.txt | 10 +- doc/example/reportingdemo.txt | 209 +++++++++++++++++++++------------- doc/example/simple.txt | 18 +-- doc/funcargs.txt | 6 +- doc/getting-started.txt | 15 ++- doc/mark.txt | 8 +- doc/monkeypatch.txt | 2 +- doc/skipping.txt | 4 +- doc/tmpdir.txt | 6 +- doc/unittest.txt | 4 +- pytest.py | 2 +- setup.py | 4 +- 18 files changed, 191 insertions(+), 131 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6a256c77d..3e3d0fd6a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,7 +1,7 @@ -Changes between 2.0.0 and 2.0.1.devX +Changes between 2.0.0 and 2.0.1 ---------------------------------------------- -- refine and unify initial capturing so that it works nicely +- refine and unify initial capturing so that it works nicely even if the logging module is used on an early-loaded conftest.py file or plugin. - fix issue12 - show plugin versions with "--version" and diff --git a/doc/assert.txt b/doc/assert.txt index ec0a848bc..4d51a5b28 100644 --- a/doc/assert.txt +++ b/doc/assert.txt @@ -23,7 +23,7 @@ assertion fails you will see the value of ``x``:: $ py.test test_assert1.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.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 linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items test_assert2.py F diff --git a/doc/capture.txt b/doc/capture.txt index fc257272e..2a9eac0fc 100644 --- a/doc/capture.txt +++ b/doc/capture.txt @@ -36,7 +36,7 @@ of the failing function and hide the other one:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev1 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 2 items test_module.py .F @@ -50,8 +50,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.04 seconds ==================== + setting up + ==================== 1 failed, 1 passed in 0.02 seconds ==================== Setting capturing methods or disabling capturing ------------------------------------------------- diff --git a/doc/doctest.txt b/doc/doctest.txt index 65a135892..5cb31ed14 100644 --- a/doc/doctest.txt +++ b/doc/doctest.txt @@ -44,9 +44,9 @@ then you can just invoke ``py.test`` without command line options:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items mymodule.py . - ========================= 1 passed in 0.03 seconds ========================= + ========================= 1 passed in 0.01 seconds ========================= diff --git a/doc/example/mysetup.txt b/doc/example/mysetup.txt index 627b42291..d271d3c46 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.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 linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-474/conftest.py:22: specify ssh host with --ssh + SKIP [1] /tmp/doc-exec-77/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 f2830f8cf..b48289108 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.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.03 seconds ==================== + ==================== 1 failed, 1 passed in 0.15 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.6.5 -- pytest-2.0.0 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 -- /home/hpk/venv/0/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -67,7 +67,7 @@ reporting in ``verbose`` mode:: usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.03 seconds ==================== + ==================== 1 failed, 1 passed in 0.06 seconds ==================== While developing your custom test collection and execution it's also interesting to just look at the collection tree:: diff --git a/doc/example/parametrize.txt b/doc/example/parametrize.txt index 7f13b35d1..e9d7218e8 100644 --- a/doc/example/parametrize.txt +++ b/doc/example/parametrize.txt @@ -46,7 +46,7 @@ the respective settings:: ================================= FAILURES ================================= _________________________ TestClass.test_equals[0] _________________________ - self = , a = 1, b = 2 + self = , a = 1, b = 2 def test_equals(self, a, b): > assert a == b @@ -55,7 +55,7 @@ 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") @@ -103,7 +103,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): @@ -113,7 +113,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): @@ -142,4 +142,4 @@ 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.74 seconds + 48 passed, 27 skipped in 2.08 seconds diff --git a/doc/example/reportingdemo.txt b/doc/example/reportingdemo.txt index 3bde92376..8363897c8 100644 --- a/doc/example/reportingdemo.txt +++ b/doc/example/reportingdemo.txt @@ -13,10 +13,10 @@ get on the terminal - we are working on that): assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 - collecting ... collected 35 items + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 + collecting ... collected 39 items - failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF ================================= FAILURES ================================= ____________________________ test_generative[0] ____________________________ @@ -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:12: 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,13 +115,13 @@ 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 b = '1'*100 + 'b' + '2'*100 > assert a == b - E assert '111111111111...2222222222222' == '111111111111...2222222222222' + E assert '111111111111...2222222222222' == '1111111111111...2222222222222' E Skipping 90 identical leading characters in diff E Skipping 91 identical trailing characters in diff E - 1111111111a222222222 @@ -132,13 +132,13 @@ 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 b = '1\n'*100 + 'b' + '2\n'*100 > assert a == b - E assert '1\n1\n1\n1\n...n2\n2\n2\n2\n' == '1\n1\n1\n1\n...n2\n2\n2\n2\n' + E assert '1\n1\n1\n1\n...n2\n2\n2\n2\n' == '1\n1\n1\n1\n1...n2\n2\n2\n2\n' E Skipping 190 identical leading characters in diff E Skipping 191 identical trailing characters in diff E 1 @@ -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,13 +217,70 @@ 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] E assert 1 in [0, 2, 3, 4, 5] failure_demo.py:78: AssertionError + __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ + + self = + + def test_not_in_text_multiline(self): + text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' + > assert 'foo' not in text + E assert 'foo' not in 'some multiline\ntext\nw...ncludes foo\nand a\ntail' + E 'foo' is contained here: + E some multiline + E text + E which + E includes foo + E ? +++ + E and a + E tail + + failure_demo.py:82: AssertionError + ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ + + self = + + def test_not_in_text_single(self): + text = 'single foo line' + > assert 'foo' not in text + E assert 'foo' not in 'single foo line' + E 'foo' is contained here: + E single foo line + E ? +++ + + failure_demo.py:86: AssertionError + _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ + + self = + + def test_not_in_text_single_long(self): + text = 'head ' * 50 + 'foo ' + 'tail ' * 20 + > assert 'foo' not in text + E assert 'foo' not in 'head head head head hea...ail tail tail tail tail ' + E 'foo' is contained here: + E head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail + E ? +++ + + failure_demo.py:90: AssertionError + ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ + + self = + + def test_not_in_text_single_long_term(self): + text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 + > assert 'f'*70 not in text + E assert 'fffffffffff...ffffffffffff' not in 'head head he...l tail tail ' + E 'ffffffffffffffffff...fffffffffffffffffff' is contained here: + E head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail + E ? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + failure_demo.py:94: AssertionError ______________________________ test_attribute ______________________________ def test_attribute(): @@ -232,9 +289,9 @@ 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:85: AssertionError + failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ def test_attribute_instance(): @@ -242,10 +299,10 @@ 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:91: AssertionError + failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ def test_attribute_failure(): @@ -256,16 +313,16 @@ get on the terminal - we are working on that): i = Foo() > assert i.b == 2 - failure_demo.py:100: + failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = + self = def _get_b(self): > raise Exception('Failed to get attrib') E Exception: Failed to get attrib - failure_demo.py:97: Exception + failure_demo.py:113: Exception _________________________ test_attribute_multiple __________________________ def test_attribute_multiple(): @@ -275,57 +332,57 @@ 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:108: AssertionError + failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = + self = def test_raises(self): s = 'qwe' > raises(TypeError, "int(s)") - failure_demo.py:117: + failure_demo.py:133: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ > int(s) E ValueError: invalid literal for int() with base 10: 'qwe' - <0-codegen /home/hpk/p/pytest/_pytest/python.py:819>:1: ValueError + <0-codegen /home/hpk/p/pytest/_pytest/python.py:822>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = + self = def test_raises_doesnt(self): > raises(IOError, "int('3')") E Failed: DID NOT RAISE - failure_demo.py:120: Failed + failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = + self = def test_raise(self): > raise ValueError("demo error") E ValueError: demo error - failure_demo.py:123: ValueError + failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = + self = def test_tupleerror(self): > a,b = [1] E ValueError: need more than 1 value to unpack - failure_demo.py:126: ValueError + 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] @@ -333,18 +390,18 @@ get on the terminal - we are working on that): > a,b = l.pop() E TypeError: 'int' object is not iterable - failure_demo.py:131: TypeError + failure_demo.py:147: TypeError ----------------------------- Captured stdout ------------------------------ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = + self = def test_some_error(self): > if namenotexi: E NameError: global name 'namenotexi' is not defined - failure_demo.py:134: NameError + failure_demo.py:150: NameError ____________________ test_dynamic_compile_shows_nicely _____________________ def test_dynamic_compile_shows_nicely(): @@ -356,17 +413,17 @@ get on the terminal - we are working on that): py.std.sys.modules[name] = module > module.foo() - failure_demo.py:149: + failure_demo.py:165: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ def foo(): > assert 1 == 0 E assert 1 == 0 - <2-codegen 'abc-123' /home/hpk/p/pytest/doc/example/assertion/failure_demo.py:146>:2: AssertionError + <2-codegen 'abc-123' /home/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(): @@ -375,7 +432,7 @@ get on the terminal - we are working on that): return 43 > somefunc(f(), g()) - failure_demo.py:159: + failure_demo.py:175: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ x = 44, y = 43 @@ -395,39 +452,39 @@ 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 = [] > a,b = l E ValueError: need more than 0 values to unpack - failure_demo.py:163: ValueError + failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = + self = def test_z2_type_error(self): l = 3 > a,b = l E TypeError: 'int' object is not iterable - failure_demo.py:167: TypeError + 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:172: AssertionError + failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = + self = def test_startswith_nested(self): def f(): @@ -435,47 +492,47 @@ 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:179: AssertionError + failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = + self = def test_global_func(self): > assert isinstance(globf(42), float) E assert isinstance(43, float) E + where 43 = globf(42) - failure_demo.py:182: AssertionError + 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 = 42 - E + where 42 = .x + E + where 42 = .x - failure_demo.py:186: AssertionError + failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = + self = def test_compare(self): > assert globf(10) < 5 E assert 11 < 5 E + where 11 = globf(10) - failure_demo.py:189: AssertionError + failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = + self = def test_try_finally(self): x = 1 @@ -483,5 +540,5 @@ get on the terminal - we are working on that): > assert x == 0 E assert 1 == 0 - failure_demo.py:194: AssertionError - ======================== 35 failed in 0.19 seconds ========================= + failure_demo.py:210: AssertionError + ======================== 39 failed in 0.22 seconds ========================= diff --git a/doc/example/simple.txt b/doc/example/simple.txt index 95fb70155..ca4db9573 100644 --- a/doc/example/simple.txt +++ b/doc/example/simple.txt @@ -138,7 +138,7 @@ let's run the full monty:: E assert 4 < 4 test_compute.py:3: AssertionError - 1 failed, 4 passed in 0.03 seconds + 1 failed, 4 passed in 0.02 seconds As expected when running the full range of ``param1`` values we'll get an error on the last one. @@ -167,13 +167,13 @@ directory with the above conftest.py:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 gw0 I / gw1 I / gw2 I / gw3 I gw0 [0] / gw1 [0] / gw2 [0] / gw3 [0] scheduling tests via LoadScheduling - ============================= in 0.43 seconds ============================= + ============================= in 0.31 seconds ============================= .. _`retrieved by hooks as item keywords`: @@ -214,12 +214,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 linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /tmp/doc-exec-46/conftest.py:9: need --runslow option to run + SKIP [1] /tmp/doc-exec-82/conftest.py:9: need --runslow option to run =================== 1 passed, 1 skipped in 0.02 seconds ==================== @@ -227,7 +227,7 @@ Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 2 items test_module.py .. @@ -319,7 +319,7 @@ which will add the string to the test header accordingly:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 project deps: mylib-1.1 collecting ... collected 0 items @@ -342,7 +342,7 @@ which will add info only when run with "--v":: $ py.test -v =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 -- /home/hpk/venv/0/bin/python info1: did you know that ... did you? collecting ... collected 0 items @@ -353,7 +353,7 @@ and nothing when run plainly:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.1.dev8 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 0 items ============================= in 0.00 seconds ============================= diff --git a/doc/funcargs.txt b/doc/funcargs.txt index ab47421dc..4f39dcfbb 100644 --- a/doc/funcargs.txt +++ b/doc/funcargs.txt @@ -45,7 +45,7 @@ Running the test looks like this:: $ py.test test_simplefactory.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items test_simplefactory.py F @@ -150,7 +150,7 @@ Running this:: $ py.test test_example.py =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 10 items test_example.py .........F @@ -188,7 +188,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 linux2 -- Python 2.6.5 -- pytest-2.0.0 -- /home/hpk/venv/0/bin/python + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 -- /home/hpk/venv/0/bin/python collecting ... collected 10 items test_example.py:6: test_func[7] PASSED diff --git a/doc/getting-started.txt b/doc/getting-started.txt index 507f6e485..923ca099a 100644 --- a/doc/getting-started.txt +++ b/doc/getting-started.txt @@ -16,7 +16,10 @@ Installation options:: To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.0.0, imported from /home/hpk/p/pytest/pytest.pyc + This is py.test version 2.0.1, imported from /home/hpk/p/pytest/pytest.py + setuptools registered plugins: + pytest-xdist-1.6.dev2 at /home/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-pep8-0.7 at /home/hpk/p/pytest-pep8/pytest_pep8.pyc If you get an error checkout :ref:`installation issues`. @@ -38,7 +41,7 @@ That's it. You can execute the test function now:: $ py.test =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items test_sample.py F @@ -128,7 +131,7 @@ run the module by passing its filename:: ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = + self = def test_two(self): x = "hello" @@ -165,7 +168,7 @@ before performing the test function call. Let's just run it:: ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/tmp/pytest-7/test_needsfiles0') + tmpdir = local('/tmp/pytest-9/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -174,8 +177,8 @@ before performing the test function call. Let's just run it:: test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /tmp/pytest-7/test_needsfiles0 - 1 failed in 0.04 seconds + /tmp/pytest-9/test_needsfiles0 + 1 failed in 0.02 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff --git a/doc/mark.txt b/doc/mark.txt index 691788b4f..d4a0c4d87 100644 --- a/doc/mark.txt +++ b/doc/mark.txt @@ -88,19 +88,19 @@ 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 4 items test_mark.py .. test_mark_classlevel.py .. - ========================= 4 passed in 0.01 seconds ========================= + ========================= 4 passed in 0.02 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 4 items ===================== 4 tests deselected by '-webtest' ===================== @@ -110,7 +110,7 @@ Or to only select the class:: $ py.test -kTestClass =========================== test session starts ============================ - platform linux2 -- Python 2.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 4 items test_mark_classlevel.py .. diff --git a/doc/monkeypatch.txt b/doc/monkeypatch.txt index f59947a0d..668e9bba6 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 0 items ============================= in 0.00 seconds ============================= diff --git a/doc/skipping.txt b/doc/skipping.txt index 226381b65..457b55180 100644 --- a/doc/skipping.txt +++ b/doc/skipping.txt @@ -121,7 +121,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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 5 items xfail_demo.py xxxxx @@ -136,7 +136,7 @@ Running it with the report-on-xfail option gives this output:: XFAIL xfail_demo.py::test_hello5 reason: reason - ======================== 5 xfailed in 0.04 seconds ========================= + ======================== 5 xfailed in 0.05 seconds ========================= imperative xfail from within a test or setup function ------------------------------------------------------ diff --git a/doc/tmpdir.txt b/doc/tmpdir.txt index 2ff348dfc..150b47f06 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.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('/tmp/pytest-8/test_create_file0') + tmpdir = local('/tmp/pytest-10/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.04 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= .. _`base temporary directory`: diff --git a/doc/unittest.txt b/doc/unittest.txt index 0c58728d1..9e71fd431 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.6.5 -- pytest-2.0.0 + platform linux2 -- Python 2.6.6 -- pytest-2.0.1 collecting ... collected 1 items test_unittest.py F @@ -56,7 +56,7 @@ Running it yields:: /usr/lib/python2.6/unittest.py:350: AssertionError ----------------------------- Captured stdout ------------------------------ hello - ========================= 1 failed in 0.03 seconds ========================= + ========================= 1 failed in 0.02 seconds ========================= .. _`unittest.py style`: http://docs.python.org/library/unittest.html diff --git a/pytest.py b/pytest.py index 197794047..23108c1ae 100644 --- a/pytest.py +++ b/pytest.py @@ -1,7 +1,7 @@ """ unit and functional testing with Python. """ -__version__ = '2.0.1.dev10' +__version__ = '2.0.1' __all__ = ['main'] from _pytest.core import main, UsageError, _preloadplugins diff --git a/setup.py b/setup.py index ad82d081f..d55129358 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def main(): name='pytest', description='py.test: simple powerful testing with Python', long_description = long_description, - version='2.0.1.dev10', + version='2.0.1', url='http://pytest.org', license='MIT license', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], @@ -67,4 +67,4 @@ def make_entry_points(): return {'console_scripts': l} if __name__ == '__main__': - main() \ No newline at end of file + main()