[py-svn] commit/pytest: hpk42: bump to release version, regenerate docs
Bitbucket
commits-noreply at bitbucket.org
Wed Mar 9 11:09:53 CET 2011
1 new changeset in pytest:
http://bitbucket.org/hpk42/pytest/changeset/0ee09ffb6691/
changeset: r2182:0ee09ffb6691
user: hpk42
date: 2011-03-09 10:58:36
summary: bump to release version, regenerate docs
affected #: 21 files (2.0 KB)
--- a/CHANGELOG Tue Mar 08 13:44:53 2011 +0100
+++ b/CHANGELOG Wed Mar 09 10:58:36 2011 +0100
@@ -1,7 +1,8 @@
Changes between 2.0.1 and 2.0.2
----------------------------------------------
-- tackle issue32 - half the overhead for running test functions
+- tackle issue32 - speed up test runs of very quick test functions
+ by reducing the relative overhead
- fix issue30 - extended xfail/skipif handling and improved reporting.
If you have a syntax error in your skip/xfail
@@ -9,7 +10,8 @@
Also you can now access module globals from xfail/skipif
expressions so that this for example works now::
-
+
+ import pytest
import mymodule
@pytest.mark.skipif("mymodule.__version__[0] == "1")
def test_function():
--- a/doc/announce/index.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/announce/index.txt Wed Mar 09 10:58:36 2011 +0100
@@ -5,6 +5,7 @@
.. toctree::
:maxdepth: 2
+ release-2.0.2
release-2.0.1
release-2.0.0
--- a/doc/assert.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/assert.txt Wed Mar 09 10:58:36 2011 +0100
@@ -23,7 +23,7 @@
$ py.test test_assert1.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_assert1.py F
@@ -37,7 +37,7 @@
E + where 3 = f()
test_assert1.py:5: AssertionError
- ========================= 1 failed in 0.03 seconds =========================
+ ========================= 1 failed in 0.07 seconds =========================
Reporting details about the failing assertion is achieved by re-evaluating
the assert expression and recording the intermediate values.
@@ -108,7 +108,7 @@
$ py.test test_assert2.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_assert2.py F
--- a/doc/capture.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/capture.txt Wed Mar 09 10:58:36 2011 +0100
@@ -64,7 +64,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.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 0x21031b8>
+ setting up <function test_func2 at 0x1cda9b0>
==================== 1 failed, 1 passed in 0.02 seconds ====================
Accessing captured output from a test function
--- a/doc/doctest.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/doctest.txt Wed Mar 09 10:58:36 2011 +0100
@@ -44,9 +44,9 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
mymodule.py .
- ========================= 1 passed in 0.02 seconds =========================
+ ========================= 1 passed in 0.01 seconds =========================
--- a/doc/example/mysetup.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/mysetup.txt Wed Mar 09 10:58:36 2011 +0100
@@ -49,7 +49,7 @@
$ py.test test_sample.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_sample.py F
@@ -57,7 +57,7 @@
================================= FAILURES =================================
_______________________________ test_answer ________________________________
- mysetup = <conftest.MySetup instance at 0x1e2db90>
+ mysetup = <conftest.MySetup instance at 0xfc64d0>
def test_answer(mysetup):
app = mysetup.myapp()
@@ -122,12 +122,12 @@
$ py.test test_ssh.py -rs
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_ssh.py s
========================= short test summary info ==========================
- SKIP [1] /tmp/doc-exec-35/conftest.py:22: specify ssh host with --ssh
+ SKIP [1] /tmp/doc-exec-36/conftest.py:22: specify ssh host with --ssh
======================== 1 skipped in 0.02 seconds =========================
--- a/doc/example/nonpython.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/nonpython.txt Wed Mar 09 10:58:36 2011 +0100
@@ -27,7 +27,7 @@
nonpython $ py.test test_simple.yml
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.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.36 seconds ====================
+ ==================== 1 failed, 1 passed in 0.51 seconds ====================
You get one dot for the passing ``sub1: sub1`` check and one failure.
Obviously in the above ``conftest.py`` you'll want to implement a more
@@ -56,7 +56,7 @@
nonpython $ py.test -v
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2 -- /home/hpk/venv/0/bin/python
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2 -- /home/hpk/venv/0/bin/python
collecting ... collected 2 items
test_simple.yml:1: usecase: ok PASSED
@@ -67,12 +67,17 @@
usecase execution failed
spec failed: 'some': 'other'
no further details known at this point.
- ==================== 1 failed, 1 passed in 0.08 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::
nonpython $ py.test --collectonly
+ =========================== test session starts ============================
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
+ collecting ... collected 2 items
<YamlFile 'test_simple.yml'><YamlItem 'ok'><YamlItem 'hello'>
+
+ ============================= in 0.06 seconds =============================
--- a/doc/example/parametrize.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/parametrize.txt Wed Mar 09 10:58:36 2011 +0100
@@ -62,7 +62,7 @@
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.
@@ -113,9 +113,14 @@
Let's first see how it looks like at collection time::
$ py.test test_backends.py --collectonly
+ =========================== test session starts ============================
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
+ collecting ... collected 2 items
<Module 'test_backends.py'><Function 'test_db_initialized[0]'><Function 'test_db_initialized[1]'>
+
+ ============================= in 0.00 seconds =============================
And then when we run the test::
@@ -125,7 +130,7 @@
================================= FAILURES =================================
__________________________ test_db_initialized[1] __________________________
- db = <conftest.DB2 instance at 0x1873170>
+ db = <conftest.DB2 instance at 0x18afef0>
def test_db_initialized(db):
# a dummy test
@@ -179,7 +184,7 @@
================================= FAILURES =================================
__________________________ test_db_initialized[1] __________________________
- db = <conftest.DB2 instance at 0x2cc75f0>
+ db = <conftest.DB2 instance at 0x214ef38>
def test_db_initialized(db):
# a dummy test
@@ -190,7 +195,7 @@
test_backends.py:6: Failed
_________________________ TestClass.test_equals[0] _________________________
- self = <test_parametrize.TestClass instance at 0x2cd3050>, a = 1, b = 2
+ self = <test_parametrize.TestClass instance at 0x2165050>, a = 1, b = 2
def test_equals(self, a, b):
> assert a == b
@@ -199,14 +204,14 @@
test_parametrize.py:17: AssertionError
______________________ TestClass.test_zerodivision[1] ______________________
- self = <test_parametrize.TestClass instance at 0x2cd3998>, a = 3, b = 2
+ self = <test_parametrize.TestClass instance at 0x2159248>, 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.04 seconds
+ 3 failed, 3 passed in 0.03 seconds
Parametrizing test methods through a decorator
--------------------------------------------------------------
@@ -247,7 +252,7 @@
================================= FAILURES =================================
_________________________ TestClass.test_equals[0] _________________________
- self = <test_parametrize2.TestClass instance at 0x10b29e0>, a = 1, b = 2
+ self = <test_parametrize2.TestClass instance at 0x1548518>, a = 1, b = 2
@params([dict(a=1, b=2), dict(a=3, b=3), ])
def test_equals(self, a, b):
@@ -257,7 +262,7 @@
test_parametrize2.py:19: AssertionError
______________________ TestClass.test_zerodivision[1] ______________________
- self = <test_parametrize2.TestClass instance at 0x10bdb00>, a = 3, b = 2
+ self = <test_parametrize2.TestClass instance at 0x1553998>, a = 3, b = 2
@params([dict(a=1, b=0), dict(a=3, b=2)])
def test_zerodivision(self, a, b):
@@ -265,7 +270,7 @@
E Failed: DID NOT RAISE
test_parametrize2.py:23: Failed
- 2 failed, 2 passed in 0.03 seconds
+ 2 failed, 2 passed in 0.02 seconds
checking serialization between Python interpreters
--------------------------------------------------------------
@@ -286,4 +291,4 @@
. $ 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 1.92 seconds
+ 48 passed, 27 skipped in 3.74 seconds
--- a/doc/example/pythoncollection.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/pythoncollection.txt Wed Mar 09 10:58:36 2011 +0100
@@ -42,11 +42,16 @@
then the test collection looks like this::
$ py.test --collectonly
+ =========================== test session starts ============================
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
+ collecting ... collected 2 items
<Module 'check_myapp.py'><Class 'CheckMyApp'><Instance '()'><Function 'check_simple'><Function 'check_complex'>
+
+ ============================= in 0.01 seconds =============================
interpret cmdline arguments as Python packages
-----------------------------------------------------
@@ -76,9 +81,14 @@
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.6.6 -- pytest-2.0.2
+ collecting ... collected 3 items
<Module 'pythoncollection.py'><Function 'test_function'><Class 'TestClass'><Instance '()'><Function 'test_method'><Function 'test_anothermethod'>
+
+ ============================= in 0.06 seconds =============================
--- a/doc/example/reportingdemo.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/reportingdemo.txt Wed Mar 09 10:58:36 2011 +0100
@@ -13,7 +13,7 @@
assertion $ py.test failure_demo.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.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 0x1b3b5d0>
+ self = <failure_demo.TestFailing object at 0x20bd310>
def test_simple(self):
def f():
@@ -40,13 +40,13 @@
> assert f() == g()
E assert 42 == 43
- E + where 42 = <function f at 0x1b3f410>()
- E + and 43 = <function g at 0x1b3f0c8>()
+ E + where 42 = <function f at 0x20b5ed8>()
+ E + and 43 = <function g at 0x210e230>()
failure_demo.py:28: AssertionError
____________________ TestFailing.test_simple_multiline _____________________
- self = <failure_demo.TestFailing object at 0x1b2e6d0>
+ self = <failure_demo.TestFailing object at 0x20bddd0>
def test_simple_multiline(self):
otherfunc_multi(
@@ -66,19 +66,19 @@
failure_demo.py:12: AssertionError
___________________________ TestFailing.test_not ___________________________
- self = <failure_demo.TestFailing object at 0x1b3b950>
+ self = <failure_demo.TestFailing object at 0x210fa10>
def test_not(self):
def f():
return 42
> assert not f()
E assert not 42
- E + where 42 = <function f at 0x1b3f668>()
+ E + where 42 = <function f at 0x210e1b8>()
failure_demo.py:38: AssertionError
_________________ TestSpecialisedExplanations.test_eq_text _________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x1b3b490>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x210fc10>
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 0x1b2ed10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x20bd750>
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 0x1b3bf10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2113950>
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 0x1b3b890>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x20bdf10>
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 0x1b538d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2113e50>
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 0x1b53b50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x20bdfd0>
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 0x1b3b390>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2113e10>
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 0x1b53b10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x21245d0>
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 0x1b439d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2124f50>
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 0x1b58750>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2130650>
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 0x1b58f10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x20bd5d0>
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 0x1b3b9d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x21136d0>
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 0x1b53bd0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2124950>
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 0x1b583d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2130610>
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 0x1b53890>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2130690>
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 0x1b58a90>.b
+ E + where 1 = <failure_demo.Foo object at 0x2113c10>.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 0x1b53dd0>.b
- E + where <failure_demo.Foo object at 0x1b53dd0> = <class 'failure_demo.Foo'>()
+ E + where 1 = <failure_demo.Foo object at 0x2124d90>.b
+ E + where <failure_demo.Foo object at 0x2124d90> = <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 0x1b582d0>
+ self = <failure_demo.Foo object at 0x2130b90>
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 0x1b58450>.b
- E + where <failure_demo.Foo object at 0x1b58450> = <class 'failure_demo.Foo'>()
- E + and 2 = <failure_demo.Bar object at 0x1b58590>.b
- E + where <failure_demo.Bar object at 0x1b58590> = <class 'failure_demo.Bar'>()
+ E + where 1 = <failure_demo.Foo object at 0x2130150>.b
+ E + where <failure_demo.Foo object at 0x2130150> = <class 'failure_demo.Foo'>()
+ E + and 2 = <failure_demo.Bar object at 0x2130850>.b
+ E + where <failure_demo.Bar object at 0x2130850> = <class 'failure_demo.Bar'>()
failure_demo.py:124: AssertionError
__________________________ TestRaises.test_raises __________________________
- self = <failure_demo.TestRaises instance at 0x1bf0440>
+ self = <failure_demo.TestRaises instance at 0x213ac68>
def test_raises(self):
s = 'qwe'
@@ -352,10 +352,10 @@
> int(s)
E ValueError: invalid literal for int() with base 10: 'qwe'
- <0-codegen /home/hpk/p/pytest/_pytest/python.py:825>:1: ValueError
+ <0-codegen /home/hpk/p/pytest/_pytest/python.py:837>:1: ValueError
______________________ TestRaises.test_raises_doesnt _______________________
- self = <failure_demo.TestRaises instance at 0x1bf0368>
+ self = <failure_demo.TestRaises instance at 0x21373b0>
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 0x1be22d8>
+ self = <failure_demo.TestRaises instance at 0x213bf80>
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 0x1b566c8>
+ self = <failure_demo.TestRaises instance at 0x213ccb0>
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 0x1beb440>
+ self = <failure_demo.TestRaises instance at 0x213d998>
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 0x1bef0e0>
+ self = <failure_demo.TestRaises instance at 0x213f710>
def test_some_error(self):
> if namenotexi:
@@ -423,7 +423,7 @@
<2-codegen 'abc-123' /home/hpk/p/pytest/doc/example/assertion/failure_demo.py:162>:2: AssertionError
____________________ TestMoreErrors.test_complex_error _____________________
- self = <failure_demo.TestMoreErrors instance at 0x1bf3fc8>
+ self = <failure_demo.TestMoreErrors instance at 0x213b5a8>
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 0x1b56ab8>
+ self = <failure_demo.TestMoreErrors instance at 0x2143440>
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 0x1bf0200>
+ self = <failure_demo.TestMoreErrors instance at 0x21440e0>
def test_z2_type_error(self):
l = 3
@@ -472,20 +472,20 @@
failure_demo.py:183: TypeError
______________________ TestMoreErrors.test_startswith ______________________
- self = <failure_demo.TestMoreErrors instance at 0x1bf7dd0>
+ self = <failure_demo.TestMoreErrors instance at 0x2144d88>
def test_startswith(self):
s = "123"
g = "456"
> assert s.startswith(g)
E assert False
- E + where False = <built-in method startswith of str object at 0x1abeb10>('456')
- E + where <built-in method startswith of str object at 0x1abeb10> = '123'.startswith
+ E + where False = <built-in method startswith of str object at 0x20a3810>('456')
+ E + where <built-in method startswith of str object at 0x20a3810> = '123'.startswith
failure_demo.py:188: AssertionError
__________________ TestMoreErrors.test_startswith_nested ___________________
- self = <failure_demo.TestMoreErrors instance at 0x1bf8a70>
+ self = <failure_demo.TestMoreErrors instance at 0x2144320>
def test_startswith_nested(self):
def f():
@@ -494,15 +494,15 @@
return "456"
> assert f().startswith(g())
E assert False
- E + where False = <built-in method startswith of str object at 0x1abeb10>('456')
- E + where <built-in method startswith of str object at 0x1abeb10> = '123'.startswith
- E + where '123' = <function f at 0x1bf9050>()
- E + and '456' = <function g at 0x1bf90c8>()
+ E + where False = <built-in method startswith of str object at 0x20a3810>('456')
+ E + where <built-in method startswith of str object at 0x20a3810> = '123'.startswith
+ E + where '123' = <function f at 0x211a500>()
+ E + and '456' = <function g at 0x212dde8>()
failure_demo.py:195: AssertionError
_____________________ TestMoreErrors.test_global_func ______________________
- self = <failure_demo.TestMoreErrors instance at 0x1bf0248>
+ self = <failure_demo.TestMoreErrors instance at 0x21345a8>
def test_global_func(self):
> assert isinstance(globf(42), float)
@@ -513,19 +513,19 @@
failure_demo.py:198: AssertionError
_______________________ TestMoreErrors.test_instance _______________________
- self = <failure_demo.TestMoreErrors instance at 0x1be2998>
+ self = <failure_demo.TestMoreErrors instance at 0x213c998>
def test_instance(self):
self.x = 6*7
> assert self.x != 42
E assert 42 != 42
E + where 42 = 42
- E + where 42 = <failure_demo.TestMoreErrors instance at 0x1be2998>.x
+ E + where 42 = <failure_demo.TestMoreErrors instance at 0x213c998>.x
failure_demo.py:202: AssertionError
_______________________ TestMoreErrors.test_compare ________________________
- self = <failure_demo.TestMoreErrors instance at 0x1bf7f80>
+ self = <failure_demo.TestMoreErrors instance at 0x2257998>
def test_compare(self):
> assert globf(10) < 5
@@ -535,7 +535,7 @@
failure_demo.py:205: AssertionError
_____________________ TestMoreErrors.test_try_finally ______________________
- self = <failure_demo.TestMoreErrors instance at 0x1bfb878>
+ self = <failure_demo.TestMoreErrors instance at 0x2258908>
def test_try_finally(self):
x = 1
@@ -544,4 +544,4 @@
E assert 1 == 0
failure_demo.py:210: AssertionError
- ======================== 39 failed in 0.26 seconds =========================
+ ======================== 39 failed in 0.19 seconds =========================
--- a/doc/example/simple.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/example/simple.txt Wed Mar 09 10:58:36 2011 +0100
@@ -109,13 +109,13 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
gw0 I / gw1 I / gw2 I / gw3 I
gw0 [0] / gw1 [0] / gw2 [0] / gw3 [0]
scheduling tests via LoadScheduling
- ============================= in 0.35 seconds =============================
+ ============================= in 0.51 seconds =============================
.. _`excontrolskip`:
@@ -156,12 +156,12 @@
$ py.test -rs # "-rs" means report details on the little 's'
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 2 items
test_module.py .s
========================= short test summary info ==========================
- SKIP [1] /tmp/doc-exec-40/conftest.py:9: need --runslow option to run
+ SKIP [1] /tmp/doc-exec-41/conftest.py:9: need --runslow option to run
=================== 1 passed, 1 skipped in 0.02 seconds ====================
@@ -169,7 +169,7 @@
$ py.test --runslow
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.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.03 seconds
+ 1 failed in 0.01 seconds
Detect if running from within a py.test run
--------------------------------------------------------------
@@ -261,7 +261,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
project deps: mylib-1.1
collecting ... collected 0 items
@@ -284,7 +284,7 @@
$ py.test -v
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2 -- /home/hpk/venv/0/bin/python
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2 -- /home/hpk/venv/0/bin/python
info1: did you know that ...
did you?
collecting ... collected 0 items
@@ -295,7 +295,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 0 items
============================= in 0.00 seconds =============================
--- a/doc/funcargs.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/funcargs.txt Wed Mar 09 10:58:36 2011 +0100
@@ -61,7 +61,7 @@
$ py.test test_simplefactory.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_simplefactory.py F
@@ -167,7 +167,7 @@
$ py.test test_example.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 10 items
test_example.py .........F
@@ -182,13 +182,16 @@
E assert 9 < 9
test_example.py:7: AssertionError
- ==================== 1 failed, 9 passed in 0.05 seconds ====================
+ ==================== 1 failed, 9 passed in 0.02 seconds ====================
Note that the ``pytest_generate_tests(metafunc)`` hook is called during
the test collection phase which is separate from the actual test running.
Let's just look at what is collected::
$ py.test --collectonly test_example.py
+ =========================== test session starts ============================
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
+ collecting ... collected 10 items
<Module 'test_example.py'><Function 'test_func[0]'><Function 'test_func[1]'>
@@ -200,12 +203,14 @@
<Function 'test_func[7]'><Function 'test_func[8]'><Function 'test_func[9]'>
+
+ ============================= in 0.00 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.6.6 -- pytest-2.0.2.dev2 -- /home/hpk/venv/0/bin/python
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2 -- /home/hpk/venv/0/bin/python
collecting ... collected 10 items
test_example.py:6: test_func[7] PASSED
--- a/doc/getting-started.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/getting-started.txt Wed Mar 09 10:58:36 2011 +0100
@@ -16,10 +16,9 @@
To check your installation has installed the correct version::
$ py.test --version
- This is py.test version 2.0.2.dev2, imported from /home/hpk/p/pytest/pytest.py
+ This is py.test version 2.0.2, 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`.
@@ -41,7 +40,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_sample.py F
@@ -100,7 +99,7 @@
$ py.test -q test_sysexit.py
collecting ... collected 1 items
.
- 1 passed in 0.01 seconds
+ 1 passed in 0.00 seconds
.. todo:: For further ways to assert exceptions see the `raises`
@@ -131,7 +130,7 @@
================================= FAILURES =================================
____________________________ TestClass.test_two ____________________________
- self = <test_class.TestClass instance at 0x187d758>
+ self = <test_class.TestClass instance at 0x24565a8>
def test_two(self):
x = "hello"
@@ -140,7 +139,7 @@
E + where False = hasattr('hello', 'check')
test_class.py:8: AssertionError
- 1 failed, 1 passed in 0.04 seconds
+ 1 failed, 1 passed in 0.02 seconds
The first test passed, the second failed. Again we can easily see
the intermediate values used in the assertion, helping us to
@@ -169,7 +168,7 @@
================================= FAILURES =================================
_____________________________ test_needsfiles ______________________________
- tmpdir = local('/tmp/pytest-92/test_needsfiles0')
+ tmpdir = local('/tmp/pytest-0/test_needsfiles0')
def test_needsfiles(tmpdir):
print tmpdir
@@ -178,8 +177,8 @@
test_tmpdir.py:3: AssertionError
----------------------------- Captured stdout ------------------------------
- /tmp/pytest-92/test_needsfiles0
- 1 failed in 0.14 seconds
+ /tmp/pytest-0/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`.
--- a/doc/mark.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/mark.txt Wed Mar 09 10:58:36 2011 +0100
@@ -88,19 +88,19 @@
$ py.test -k webtest # running with the above defined examples yields
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 4 items
test_mark.py ..
test_mark_classlevel.py ..
- ========================= 4 passed in 0.02 seconds =========================
+ ========================= 4 passed in 0.01 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.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 4 items
===================== 4 tests deselected by '-webtest' =====================
@@ -110,7 +110,7 @@
$ py.test -kTestClass
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 4 items
test_mark_classlevel.py ..
--- a/doc/monkeypatch.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/monkeypatch.txt Wed Mar 09 10:58:36 2011 +0100
@@ -39,7 +39,7 @@
.. background check:
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 0 items
============================= in 0.00 seconds =============================
--- a/doc/skipping.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/skipping.txt Wed Mar 09 10:58:36 2011 +0100
@@ -130,14 +130,14 @@
example $ py.test -rx xfail_demo.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 6 items
xfail_demo.py xxxxxx
========================= short test summary info ==========================
XFAIL xfail_demo.py::test_hello
XFAIL xfail_demo.py::test_hello2
- reason: [NOTRUN]
+ reason: [NOTRUN]
XFAIL xfail_demo.py::test_hello3
condition: hasattr(os, 'sep')
XFAIL xfail_demo.py::test_hello4
@@ -147,7 +147,7 @@
XFAIL xfail_demo.py::test_hello6
reason: reason
- ======================== 6 xfailed in 0.06 seconds =========================
+ ======================== 6 xfailed in 0.04 seconds =========================
.. _`evaluation of skipif/xfail conditions`:
--- a/doc/tmpdir.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/tmpdir.txt Wed Mar 09 10:58:36 2011 +0100
@@ -28,7 +28,7 @@
$ py.test test_tmpdir.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_tmpdir.py F
@@ -36,7 +36,7 @@
================================= FAILURES =================================
_____________________________ test_create_file _____________________________
- tmpdir = local('/tmp/pytest-93/test_create_file0')
+ tmpdir = local('/tmp/pytest-1/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.04 seconds =========================
+ ========================= 1 failed in 0.02 seconds =========================
.. _`base temporary directory`:
--- a/doc/unittest.txt Tue Mar 08 13:44:53 2011 +0100
+++ b/doc/unittest.txt Wed Mar 09 10:58:36 2011 +0100
@@ -24,7 +24,7 @@
$ py.test test_unittest.py
=========================== test session starts ============================
- platform linux2 -- Python 2.6.6 -- pytest-2.0.2.dev2
+ platform linux2 -- Python 2.6.6 -- pytest-2.0.2
collecting ... collected 1 items
test_unittest.py F
@@ -37,26 +37,12 @@
def test_method(self):
x = 1
> self.assertEquals(x, 3)
+ E AssertionError: 1 != 3
- test_unittest.py:8:
- _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
- self = <test_unittest.MyTest testMethod=test_method>, first = 1, second = 3
- msg = None
-
- def failUnlessEqual(self, first, second, msg=None):
- """Fail if the two objects are unequal as determined by the '=='
- operator.
- """
- if not first == second:
- raise self.failureException, \
- > (msg or '%r != %r' % (first, second))
- E AssertionError: 1 != 3
-
- /usr/lib/python2.6/unittest.py:350: AssertionError
+ test_unittest.py:8: 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
--- a/pytest.py Tue Mar 08 13:44:53 2011 +0100
+++ b/pytest.py Wed Mar 09 10:58:36 2011 +0100
@@ -1,7 +1,7 @@
"""
unit and functional testing with Python.
"""
-__version__ = '2.0.2.dev7'
+__version__ = '2.0.2'
__all__ = ['main']
from _pytest.core import main, UsageError, _preloadplugins
--- a/setup.py Tue Mar 08 13:44:53 2011 +0100
+++ b/setup.py Wed Mar 09 10:58:36 2011 +0100
@@ -22,7 +22,7 @@
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.0.2.dev7',
+ version='2.0.2',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the pytest-commit
mailing list