1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/92b916483c1e/ changeset: 92b916483c1e user: hpk42 date: 2012-02-06 00:33:04 summary: regen docs / examples for 2.2.2 affected #: 16 files diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/assert.txt --- a/doc/assert.txt +++ b/doc/assert.txt @@ -23,7 +23,7 @@ $ py.test test_assert1.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_assert1.py F @@ -105,7 +105,7 @@ $ py.test test_assert2.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_assert2.py F @@ -124,7 +124,7 @@ E '5' test_assert2.py:5: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.03 seconds ========================= Special comparisons are done for a number of cases: diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/builtin.txt --- a/doc/builtin.txt +++ b/doc/builtin.txt @@ -28,7 +28,7 @@ $ py.test --funcargs =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collected 0 items pytestconfig the pytest config object with access to command line opts. @@ -60,6 +60,7 @@ monkeypatch.setenv(name, value, prepend=False) monkeypatch.delenv(name, value, raising=True) monkeypatch.syspath_prepend(path) + monkeypatch.chdir(path) All modifications will be undone after the requesting test function has finished. The ``raising`` @@ -75,5 +76,7 @@ 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 ============================= + ============================= in 0.01 seconds ============================= diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/capture.txt --- a/doc/capture.txt +++ b/doc/capture.txt @@ -64,7 +64,7 @@ $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items test_module.py .F @@ -78,7 +78,7 @@ test_module.py:9: AssertionError ----------------------------- Captured stdout ------------------------------ - setting up <function test_func2 at 0x101314c80> + setting up <function test_func2 at 0x1013230c8> ==================== 1 failed, 1 passed in 0.03 seconds ==================== Accessing captured output from a test function diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/doctest.txt --- a/doc/doctest.txt +++ b/doc/doctest.txt @@ -44,10 +44,10 @@ $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items mymodule.py . - ========================= 1 passed in 0.05 seconds ========================= + ========================= 1 passed in 0.51 seconds ========================= [?1034h \ No newline at end of file diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/markers.txt --- a/doc/example/markers.txt +++ b/doc/example/markers.txt @@ -25,26 +25,26 @@ 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.2.dev3 -- /Users/hpk/venv/1/bin/python + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 -- /Users/hpk/venv/0/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.03 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.2.dev3 -- /Users/hpk/venv/1/bin/python + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 -- /Users/hpk/venv/0/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.03 seconds ==================== + ================= 1 tests deselected by "-m 'not webtest'" ================= + ================== 1 passed, 1 deselected in 0.02 seconds ================== Registering markers ------------------------------------- @@ -142,39 +142,39 @@ 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.2.dev3 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 4 items test_server.py . - ===================== 3 tests deselected by '-ksend_http' ====================== - ==================== 1 passed, 3 deselected in 0.06 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.2.dev3 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 4 items test_mark_classlevel.py .. test_server.py . - ===================== 1 tests deselected by '-k-send_http' ===================== - ==================== 3 passed, 1 deselected in 0.05 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.2.dev3 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 4 items test_mark_classlevel.py .. - ===================== 2 tests deselected by '-kTestClass' ====================== - ==================== 2 passed, 2 deselected in 0.04 seconds ==================== + =================== 2 tests deselected by '-kTestClass' ==================== + ================== 2 passed, 2 deselected in 0.03 seconds ================== .. _`adding a custom marker from a plugin`: @@ -222,24 +222,24 @@ the test needs:: $ py.test -E stage2 - ============================= test session starts ============================== - platform darwin -- Python 2.7.1 -- pytest-2.2.2.dev3 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_someenv.py s - ========================== 1 skipped in 0.03 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.2.dev3 + =========================== test session starts ============================ + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_someenv.py . - =========================== 1 passed in 0.03 seconds =========================== + ========================= 1 passed in 0.02 seconds ========================= The ``--markers`` option always gives you a list of available markers:: @@ -291,7 +291,7 @@ $ py.test -q -s collecting ... collected 2 items .. - 2 passed in 0.04 seconds + 2 passed in 0.02 seconds glob args=('function',) kwargs={'x': 3} + glob args=('class',) kwargs={'x': 2} glob args=('module',) kwargs={'x': 1} - glob args=('class',) kwargs={'x': 2} diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/mysetup.txt --- a/doc/example/mysetup.txt +++ b/doc/example/mysetup.txt @@ -49,7 +49,7 @@ $ py.test test_sample.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_sample.py F @@ -57,7 +57,7 @@ ================================= FAILURES ================================= _______________________________ test_answer ________________________________ - mysetup = <conftest.MySetup instance at 0x10131c098> + mysetup = <conftest.MySetup instance at 0x101322fc8> def test_answer(mysetup): app = mysetup.myapp() @@ -66,7 +66,7 @@ E assert 54 == 42 test_sample.py:4: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.72 seconds ========================= This means that our ``mysetup`` object was successfully instantiated and ``mysetup.app()`` returned an initialized ``MyApp`` instance. @@ -122,12 +122,12 @@ $ py.test test_ssh.py -rs =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_ssh.py s ========================= short test summary info ========================== - SKIP [1] /Users/hpk/tmp/doc-exec-44/conftest.py:22: specify ssh host with --ssh + SKIP [1] /Users/hpk/tmp/doc-exec-153/conftest.py:22: specify ssh host with --ssh ======================== 1 skipped in 0.02 seconds ========================= diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/nonpython.txt --- a/doc/example/nonpython.txt +++ b/doc/example/nonpython.txt @@ -27,7 +27,7 @@ nonpython $ py.test test_simple.yml =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items test_simple.yml .F @@ -37,7 +37,7 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.09 seconds ==================== + ==================== 1 failed, 1 passed in 0.48 seconds ==================== You get one dot for the passing ``sub1: sub1`` check and one failure. Obviously in the above ``conftest.py`` you'll want to implement a more @@ -56,7 +56,7 @@ nonpython $ py.test -v =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.2 -- /Users/hpk/venv/0/bin/python collecting ... collected 2 items test_simple.yml:1: usecase: ok PASSED @@ -67,17 +67,17 @@ usecase execution failed spec failed: 'some': 'other' no further details known at this point. - ==================== 1 failed, 1 passed in 0.09 seconds ==================== + ==================== 1 failed, 1 passed in 0.10 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 darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items <YamlFile 'test_simple.yml'><YamlItem 'ok'><YamlItem 'hello'> - ============================= in 0.08 seconds ============================= + ============================= in 0.18 seconds ============================= diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/parametrize.txt --- a/doc/example/parametrize.txt +++ b/doc/example/parametrize.txt @@ -96,7 +96,7 @@ $ py.test -q test_compute.py collecting ... collected 2 items .. - 2 passed in 0.02 seconds + 2 passed in 0.03 seconds We run only two computations, so we see two dots. let's run the full monty:: @@ -114,7 +114,7 @@ E assert 4 < 4 test_compute.py:3: AssertionError - 1 failed, 4 passed in 0.03 seconds + 1 failed, 4 passed in 0.05 seconds As expected when running the full range of ``param1`` values we'll get an error on the last one. @@ -154,7 +154,7 @@ $ py.test test_scenarios.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items test_scenarios.py .. @@ -166,7 +166,7 @@ $ py.test --collectonly test_scenarios.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items <Module 'test_scenarios.py'><Class 'TestSampleWithScenarios'> @@ -174,7 +174,7 @@ <Function 'test_demo[basic]'><Function 'test_demo[advanced]'> - ============================= in 0.01 seconds ============================= + ============================= in 0.05 seconds ============================= Deferring the setup of parametrized resources --------------------------------------------------- @@ -222,7 +222,7 @@ $ py.test test_backends.py --collectonly =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items <Module 'test_backends.py'><Function 'test_db_initialized[d1]'> @@ -238,7 +238,7 @@ ================================= FAILURES ================================= _________________________ test_db_initialized[d2] __________________________ - db = <conftest.DB2 instance at 0x10131c6c8> + db = <conftest.DB2 instance at 0x101323710> def test_db_initialized(db): # a dummy test @@ -247,7 +247,7 @@ E Failed: deliberately failing for demo purposes test_backends.py:6: Failed - 1 failed, 1 passed in 0.02 seconds + 1 failed, 1 passed in 0.03 seconds The first invocation with ``db == "DB1"`` passed while the second with ``db == "DB2"`` failed. Our ``pytest_funcarg__db`` factory has instantiated each of the DB values during the setup phase while the ``pytest_generate_tests`` generated two according calls to the ``test_db_initialized`` during the collection phase. @@ -295,7 +295,7 @@ ================================= FAILURES ================================= ________________________ TestClass.test_equals[1-2] ________________________ - self = <test_parametrize.TestClass instance at 0x101320200>, a = 1, b = 2 + self = <test_parametrize.TestClass instance at 0x101326368>, a = 1, b = 2 def test_equals(self, a, b): > assert a == b @@ -326,4 +326,4 @@ ========================= 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.01 seconds + 27 passed, 48 skipped in 7.76 seconds diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/pythoncollection.txt --- a/doc/example/pythoncollection.txt +++ b/doc/example/pythoncollection.txt @@ -43,7 +43,7 @@ $ py.test --collectonly =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items <Module 'check_myapp.py'><Class 'CheckMyApp'> @@ -82,7 +82,7 @@ . $ py.test --collectonly pythoncollection.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 3 items <Module 'pythoncollection.py'><Function 'test_function'> diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/reportingdemo.txt --- a/doc/example/reportingdemo.txt +++ b/doc/example/reportingdemo.txt @@ -13,7 +13,7 @@ assertion $ py.test failure_demo.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 39 items failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF @@ -30,7 +30,7 @@ failure_demo.py:15: AssertionError _________________________ TestFailing.test_simple __________________________ - self = <failure_demo.TestFailing object at 0x101356250> + self = <failure_demo.TestFailing object at 0x101490690> def test_simple(self): def f(): @@ -40,13 +40,13 @@ > assert f() == g() E assert 42 == 43 - E + where 42 = <function f at 0x101328848>() - E + and 43 = <function g at 0x1013288c0>() + E + where 42 = <function f at 0x101462b90>() + E + and 43 = <function g at 0x101462c08>() failure_demo.py:28: AssertionError ____________________ TestFailing.test_simple_multiline _____________________ - self = <failure_demo.TestFailing object at 0x101356810> + self = <failure_demo.TestFailing object at 0x101490b10> def test_simple_multiline(self): otherfunc_multi( @@ -66,19 +66,19 @@ failure_demo.py:11: AssertionError ___________________________ TestFailing.test_not ___________________________ - self = <failure_demo.TestFailing object at 0x101356a10> + self = <failure_demo.TestFailing object at 0x101490210> def test_not(self): def f(): return 42 > assert not f() E assert not 42 - E + where 42 = <function f at 0x101328758>() + E + where 42 = <function f at 0x101462aa0>() failure_demo.py:38: AssertionError _________________ TestSpecialisedExplanations.test_eq_text _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101356c50> + self = <failure_demo.TestSpecialisedExplanations object at 0x101490a10> def test_eq_text(self): > assert 'spam' == 'eggs' @@ -89,7 +89,7 @@ failure_demo.py:42: AssertionError _____________ TestSpecialisedExplanations.test_eq_similar_text _____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1013542d0> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148d9d0> def test_eq_similar_text(self): > assert 'foo 1 bar' == 'foo 2 bar' @@ -102,7 +102,7 @@ failure_demo.py:45: AssertionError ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101354590> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148d590> def test_eq_multiline_text(self): > assert 'foo\nspam\nbar' == 'foo\neggs\nbar' @@ -115,7 +115,7 @@ failure_demo.py:48: AssertionError ______________ TestSpecialisedExplanations.test_eq_long_text _______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101354710> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148dc90> def test_eq_long_text(self): a = '1'*100 + 'a' + '2'*100 @@ -132,7 +132,7 @@ failure_demo.py:53: AssertionError _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1013529d0> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148d910> def test_eq_long_text_multiline(self): a = '1\n'*100 + 'a' + '2\n'*100 @@ -156,7 +156,7 @@ failure_demo.py:58: AssertionError _________________ TestSpecialisedExplanations.test_eq_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101352750> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148b9d0> def test_eq_list(self): > assert [0, 1, 2] == [0, 1, 3] @@ -166,7 +166,7 @@ failure_demo.py:61: AssertionError ______________ TestSpecialisedExplanations.test_eq_list_long _______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101352ad0> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148b750> def test_eq_list_long(self): a = [0]*100 + [1] + [3]*100 @@ -178,7 +178,7 @@ failure_demo.py:66: AssertionError _________________ TestSpecialisedExplanations.test_eq_dict _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101352b90> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148bdd0> def test_eq_dict(self): > assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2} @@ -191,7 +191,7 @@ failure_demo.py:69: AssertionError _________________ TestSpecialisedExplanations.test_eq_set __________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101352fd0> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148b1d0> def test_eq_set(self): > assert set([0, 10, 11, 12]) == set([0, 20, 21]) @@ -207,7 +207,7 @@ failure_demo.py:72: AssertionError _____________ TestSpecialisedExplanations.test_eq_longer_list ______________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101352b50> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148bf10> def test_eq_longer_list(self): > assert [1,2] == [1,2,3] @@ -217,7 +217,7 @@ failure_demo.py:75: AssertionError _________________ TestSpecialisedExplanations.test_in_list _________________ - self = <failure_demo.TestSpecialisedExplanations object at 0x1013522d0> + self = <failure_demo.TestSpecialisedExplanations object at 0x10148b390> def test_in_list(self): > assert 1 in [0, 2, 3, 4, 5] @@ -226,7 +226,7 @@ failure_demo.py:78: AssertionError __________ TestSpecialisedExplanations.test_not_in_text_multiline __________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101351390> + self = <failure_demo.TestSpecialisedExplanations object at 0x101483e50> def test_not_in_text_multiline(self): text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail' @@ -244,7 +244,7 @@ failure_demo.py:82: AssertionError ___________ TestSpecialisedExplanations.test_not_in_text_single ____________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101351410> + self = <failure_demo.TestSpecialisedExplanations object at 0x101483c10> def test_not_in_text_single(self): text = 'single foo line' @@ -257,7 +257,7 @@ failure_demo.py:86: AssertionError _________ TestSpecialisedExplanations.test_not_in_text_single_long _________ - self = <failure_demo.TestSpecialisedExplanations object at 0x101351510> + self = <failure_demo.TestSpecialisedExplanations object at 0x101483ed0> def test_not_in_text_single_long(self): text = 'head ' * 50 + 'foo ' + 'tail ' * 20 @@ -270,7 +270,7 @@ failure_demo.py:90: AssertionError ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______ - self = <failure_demo.TestSpecialisedExplanations object at 0x101351a10> + self = <failure_demo.TestSpecialisedExplanations object at 0x101483310> def test_not_in_text_single_long_term(self): text = 'head ' * 50 + 'f'*70 + 'tail ' * 20 @@ -289,7 +289,7 @@ i = Foo() > assert i.b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x101351b50>.b + E + where 1 = <failure_demo.Foo object at 0x101483f50>.b failure_demo.py:101: AssertionError _________________________ test_attribute_instance __________________________ @@ -299,8 +299,8 @@ b = 1 > assert Foo().b == 2 E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x101351810>.b - E + where <failure_demo.Foo object at 0x101351810> = <class 'failure_demo.Foo'>() + E + where 1 = <failure_demo.Foo object at 0x101483210>.b + E + where <failure_demo.Foo object at 0x101483210> = <class 'failure_demo.Foo'>() failure_demo.py:107: AssertionError __________________________ test_attribute_failure __________________________ @@ -316,7 +316,7 @@ failure_demo.py:116: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ - self = <failure_demo.Foo object at 0x101351c50> + self = <failure_demo.Foo object at 0x101483450> def _get_b(self): > raise Exception('Failed to get attrib') @@ -332,15 +332,15 @@ b = 2 > assert Foo().b == Bar().b E assert 1 == 2 - E + where 1 = <failure_demo.Foo object at 0x101351f10>.b - E + where <failure_demo.Foo object at 0x101351f10> = <class 'failure_demo.Foo'>() - E + and 2 = <failure_demo.Bar object at 0x1013519d0>.b - E + where <failure_demo.Bar object at 0x1013519d0> = <class 'failure_demo.Bar'>() + E + where 1 = <failure_demo.Foo object at 0x101483150>.b + E + where <failure_demo.Foo object at 0x101483150> = <class 'failure_demo.Foo'>() + E + and 2 = <failure_demo.Bar object at 0x101483350>.b + E + where <failure_demo.Bar object at 0x101483350> = <class 'failure_demo.Bar'>() failure_demo.py:124: AssertionError __________________________ TestRaises.test_raises __________________________ - self = <failure_demo.TestRaises instance at 0x101373710> + self = <failure_demo.TestRaises instance at 0x1014a6758> def test_raises(self): s = 'qwe' @@ -352,10 +352,10 @@ > int(s) E ValueError: invalid literal for int() with base 10: 'qwe' - <0-codegen /Users/hpk/p/pytest/_pytest/python.py:958>:1: ValueError + <0-codegen /Users/hpk/p/pytest/_pytest/python.py:976>:1: ValueError ______________________ TestRaises.test_raises_doesnt _______________________ - self = <failure_demo.TestRaises instance at 0x101334f38> + self = <failure_demo.TestRaises instance at 0x1014b03f8> def test_raises_doesnt(self): > raises(IOError, "int('3')") @@ -364,7 +364,7 @@ failure_demo.py:136: Failed __________________________ TestRaises.test_raise ___________________________ - self = <failure_demo.TestRaises instance at 0x10136d950> + self = <failure_demo.TestRaises instance at 0x1014a8998> def test_raise(self): > raise ValueError("demo error") @@ -373,7 +373,7 @@ failure_demo.py:139: ValueError ________________________ TestRaises.test_tupleerror ________________________ - self = <failure_demo.TestRaises instance at 0x101367758> + self = <failure_demo.TestRaises instance at 0x1014a27a0> def test_tupleerror(self): > a,b = [1] @@ -382,7 +382,7 @@ failure_demo.py:142: ValueError ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______ - self = <failure_demo.TestRaises instance at 0x10136a4d0> + self = <failure_demo.TestRaises instance at 0x1014a5518> def test_reinterpret_fails_with_print_for_the_fun_of_it(self): l = [1,2,3] @@ -395,7 +395,7 @@ l is [1, 2, 3] ________________________ TestRaises.test_some_error ________________________ - self = <failure_demo.TestRaises instance at 0x1013692d8> + self = <failure_demo.TestRaises instance at 0x1014a1320> def test_some_error(self): > if namenotexi: @@ -423,7 +423,7 @@ <2-codegen 'abc-123' /Users/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError ____________________ TestMoreErrors.test_complex_error _____________________ - self = <failure_demo.TestMoreErrors instance at 0x1013730e0> + self = <failure_demo.TestMoreErrors instance at 0x1014a6638> def test_complex_error(self): def f(): @@ -452,7 +452,7 @@ failure_demo.py:5: AssertionError ___________________ TestMoreErrors.test_z1_unpack_error ____________________ - self = <failure_demo.TestMoreErrors instance at 0x101368290> + self = <failure_demo.TestMoreErrors instance at 0x1014a42d8> def test_z1_unpack_error(self): l = [] @@ -462,7 +462,7 @@ failure_demo.py:179: ValueError ____________________ TestMoreErrors.test_z2_type_error _____________________ - self = <failure_demo.TestMoreErrors instance at 0x1013610e0> + self = <failure_demo.TestMoreErrors instance at 0x1014a0128> def test_z2_type_error(self): l = 3 @@ -472,19 +472,19 @@ failure_demo.py:183: TypeError ______________________ TestMoreErrors.test_startswith ______________________ - self = <failure_demo.TestMoreErrors instance at 0x101361ea8> + self = <failure_demo.TestMoreErrors instance at 0x1014a0ef0> def test_startswith(self): s = "123" g = "456" > assert s.startswith(g) - E assert <built-in method startswith of str object at 0x101357a58>('456') - E + where <built-in method startswith of str object at 0x101357a58> = '123'.startswith + E assert <built-in method startswith of str object at 0x1014951c0>('456') + E + where <built-in method startswith of str object at 0x1014951c0> = '123'.startswith failure_demo.py:188: AssertionError __________________ TestMoreErrors.test_startswith_nested ___________________ - self = <failure_demo.TestMoreErrors instance at 0x101368128> + self = <failure_demo.TestMoreErrors instance at 0x1014a4170> def test_startswith_nested(self): def f(): @@ -492,15 +492,15 @@ def g(): return "456" > assert f().startswith(g()) - E assert <built-in method startswith of str object at 0x101357a58>('456') - E + where <built-in method startswith of str object at 0x101357a58> = '123'.startswith - E + where '123' = <function f at 0x101339938>() - E + and '456' = <function g at 0x101339cf8>() + E assert <built-in method startswith of str object at 0x1014951c0>('456') + E + where <built-in method startswith of str object at 0x1014951c0> = '123'.startswith + E + where '123' = <function f at 0x1014aea28>() + E + and '456' = <function g at 0x101477c80>() failure_demo.py:195: AssertionError _____________________ TestMoreErrors.test_global_func ______________________ - self = <failure_demo.TestMoreErrors instance at 0x101336758> + self = <failure_demo.TestMoreErrors instance at 0x1014b3ab8> def test_global_func(self): > assert isinstance(globf(42), float) @@ -510,18 +510,18 @@ failure_demo.py:198: AssertionError _______________________ TestMoreErrors.test_instance _______________________ - self = <failure_demo.TestMoreErrors instance at 0x1013678c0> + self = <failure_demo.TestMoreErrors instance at 0x1014a2878> def test_instance(self): self.x = 6*7 > assert self.x != 42 E assert 42 != 42 - E + where 42 = <failure_demo.TestMoreErrors instance at 0x1013678c0>.x + E + where 42 = <failure_demo.TestMoreErrors instance at 0x1014a2878>.x failure_demo.py:202: AssertionError _______________________ TestMoreErrors.test_compare ________________________ - self = <failure_demo.TestMoreErrors instance at 0x101366a28> + self = <failure_demo.TestMoreErrors instance at 0x10149da70> def test_compare(self): > assert globf(10) < 5 @@ -531,7 +531,7 @@ failure_demo.py:205: AssertionError _____________________ TestMoreErrors.test_try_finally ______________________ - self = <failure_demo.TestMoreErrors instance at 0x1013628c0> + self = <failure_demo.TestMoreErrors instance at 0x101493908> def test_try_finally(self): x = 1 @@ -540,4 +540,4 @@ E assert 1 == 0 failure_demo.py:210: AssertionError - ======================== 39 failed in 0.41 seconds ========================= + ======================== 39 failed in 1.05 seconds ========================= diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/example/simple.txt --- a/doc/example/simple.txt +++ b/doc/example/simple.txt @@ -53,7 +53,7 @@ test_sample.py:6: AssertionError ----------------------------- Captured stdout ------------------------------ first - 1 failed in 0.02 seconds + 1 failed in 0.50 seconds And now with supplying a command line option:: @@ -109,13 +109,13 @@ $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 gw0 I gw0 [0] scheduling tests via LoadScheduling - ============================= in 0.54 seconds ============================= + ============================= in 5.12 seconds ============================= .. _`excontrolskip`: @@ -156,20 +156,20 @@ $ py.test -rs # "-rs" means report details on the little 's' =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items test_module.py .s ========================= short test summary info ========================== - SKIP [1] /Users/hpk/tmp/doc-exec-49/conftest.py:9: need --runslow option to run + SKIP [1] /Users/hpk/tmp/doc-exec-158/conftest.py:9: need --runslow option to run - =================== 1 passed, 1 skipped in 0.02 seconds ==================== + =================== 1 passed, 1 skipped in 0.09 seconds ==================== Or run it including the ``slow`` marked test:: $ py.test --runslow =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 2 items test_module.py .. @@ -213,7 +213,7 @@ E Failed: not configured: 42 test_checkconfig.py:8: Failed - 1 failed in 0.02 seconds + 1 failed in 0.07 seconds Detect if running from within a py.test run -------------------------------------------------------------- @@ -261,11 +261,11 @@ $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 project deps: mylib-1.1 collecting ... collected 0 items - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= .. regendoc:wipe @@ -284,21 +284,21 @@ $ py.test -v =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.2 -- /Users/hpk/venv/0/bin/python info1: did you know that ... did you? collecting ... collected 0 items - ============================= in 0.00 seconds ============================= + ============================= in 0.03 seconds ============================= and nothing when run plainly:: $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 0 items - ============================= in 0.00 seconds ============================= + ============================= in 0.01 seconds ============================= profiling test duration -------------------------- @@ -327,7 +327,7 @@ $ py.test --durations=3 =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 3 items test_some_are_slow.py ... @@ -335,5 +335,5 @@ ========================= slowest 3 test durations ========================= 0.20s call test_some_are_slow.py::test_funcslow2 0.10s call test_some_are_slow.py::test_funcslow1 - 0.00s setup test_some_are_slow.py::test_funcfast - ========================= 3 passed in 0.32 seconds ========================= + 0.00s call test_some_are_slow.py::test_funcfast + ========================= 3 passed in 0.33 seconds ========================= diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/funcargs.txt --- a/doc/funcargs.txt +++ b/doc/funcargs.txt @@ -62,7 +62,7 @@ $ py.test test_simplefactory.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_simplefactory.py F @@ -77,7 +77,7 @@ E assert 42 == 17 test_simplefactory.py:5: AssertionError - ========================= 1 failed in 0.02 seconds ========================= + ========================= 1 failed in 0.03 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 @@ $ py.test test_example.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 10 items test_example.py .........F @@ -182,7 +182,7 @@ E assert 9 < 9 test_example.py:6: AssertionError - ==================== 1 failed, 9 passed in 0.05 seconds ==================== + ==================== 1 failed, 9 passed in 0.07 seconds ==================== Obviously, only when ``numiter`` has the value of ``9`` does the test fail. 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 @@ $ py.test --collectonly test_example.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 10 items <Module 'test_example.py'><Function 'test_func[0]'> @@ -210,13 +210,13 @@ $ 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.1 -- /Users/hpk/venv/1/bin/python + platform darwin -- Python 2.7.1 -- pytest-2.2.2 -- /Users/hpk/venv/0/bin/python collecting ... collected 10 items test_example.py:5: test_func[7] PASSED ======================= 9 tests deselected by '-k7' ======================== - ================== 1 passed, 9 deselected in 0.02 seconds ================== + ================== 1 passed, 9 deselected in 0.01 seconds ================== You might want to look at :ref:`more parametrization examples <paramexamples>`. diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/getting-started.txt --- a/doc/getting-started.txt +++ b/doc/getting-started.txt @@ -22,9 +22,10 @@ To check your installation has installed the correct version:: $ py.test --version - This is py.test version 2.2.1, imported from /Users/hpk/p/pytest/pytest.pyc + This is py.test version 2.2.2, imported from /Users/hpk/p/pytest/pytest.pyc setuptools registered plugins: - pytest-xdist-1.8.dev2 at /Users/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-xdist-1.8 at /Users/hpk/p/pytest-xdist/xdist/plugin.pyc + pytest-cov-1.4 at /Users/hpk/venv/0/lib/python2.7/site-packages/pytest_cov.pyc If you get an error checkout :ref:`installation issues`. @@ -46,7 +47,7 @@ $ py.test =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_sample.py F @@ -126,7 +127,7 @@ ================================= FAILURES ================================= ____________________________ TestClass.test_two ____________________________ - self = <test_class.TestClass instance at 0x10131a560> + self = <test_class.TestClass instance at 0x1013225a8> def test_two(self): x = "hello" @@ -163,7 +164,7 @@ ================================= FAILURES ================================= _____________________________ test_needsfiles ______________________________ - tmpdir = local('/Users/hpk/tmp/pytest-679/test_needsfiles0') + tmpdir = local('/Users/hpk/tmp/pytest-20/test_needsfiles0') def test_needsfiles(tmpdir): print tmpdir @@ -172,8 +173,8 @@ test_tmpdir.py:3: AssertionError ----------------------------- Captured stdout ------------------------------ - /Users/hpk/tmp/pytest-679/test_needsfiles0 - 1 failed in 0.16 seconds + /Users/hpk/tmp/pytest-20/test_needsfiles0 + 1 failed in 0.11 seconds Before the test runs, a unique-per-test-invocation temporary directory was created. More info at :ref:`tmpdir handling`. diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/skipping.txt --- a/doc/skipping.txt +++ b/doc/skipping.txt @@ -130,7 +130,7 @@ example $ py.test -rx xfail_demo.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 6 items xfail_demo.py xxxxxx @@ -147,7 +147,7 @@ XFAIL xfail_demo.py::test_hello6 reason: reason - ======================== 6 xfailed in 0.08 seconds ========================= + ======================== 6 xfailed in 0.16 seconds ========================= .. _`evaluation of skipif/xfail conditions`: diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/tmpdir.txt --- a/doc/tmpdir.txt +++ b/doc/tmpdir.txt @@ -28,7 +28,7 @@ $ py.test test_tmpdir.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_tmpdir.py F @@ -36,7 +36,7 @@ ================================= FAILURES ================================= _____________________________ test_create_file _____________________________ - tmpdir = local('/Users/hpk/tmp/pytest-680/test_create_file0') + tmpdir = local('/Users/hpk/tmp/pytest-21/test_create_file0') def test_create_file(tmpdir): p = tmpdir.mkdir("sub").join("hello.txt") @@ -47,7 +47,7 @@ E assert 0 test_tmpdir.py:7: AssertionError - ========================= 1 failed in 0.17 seconds ========================= + ========================= 1 failed in 0.07 seconds ========================= .. _`base temporary directory`: diff -r ebc6d7afeb7eda9b42fb50713723d6b299d98bf6 -r 92b916483c1e65a80dc80e3f7816b39e84b36a4d doc/unittest.txt --- a/doc/unittest.txt +++ b/doc/unittest.txt @@ -24,7 +24,7 @@ $ py.test test_unittest.py =========================== test session starts ============================ - platform darwin -- Python 2.7.1 -- pytest-2.2.1 + platform darwin -- Python 2.7.1 -- pytest-2.2.2 collecting ... collected 1 items test_unittest.py F @@ -42,7 +42,7 @@ test_unittest.py:8: AssertionError ----------------------------- Captured stdout ------------------------------ hello - ========================= 1 failed in 0.04 seconds ========================= + ========================= 1 failed in 0.15 seconds ========================= .. _`unittest.py style`: http://docs.python.org/library/unittest.html Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
