Commits

holger krekel committed 14583b7

bump to 2.3.3, add release announce

  • Participants
  • Parent commits d12ea5e

Comments (0)

Files changed (21)

-Changes between 2.3.2 and 2.3.3.dev
+Changes between 2.3.2 and 2.3.3
 -----------------------------------
 
 - fix issue214 - parse modules that contain special objects like e. g.

File _pytest/__init__.py

 #
-__version__ = '2.3.3.dev5'
+__version__ = '2.3.3'

File doc/en/announce/index.txt

 .. toctree::
    :maxdepth: 2
 
+   release-2.3.3
    release-2.3.2
    release-2.3.1
    release-2.3.0

File doc/en/assert.txt

 
     $ py.test test_assert1.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_assert1.py F
 
     $ py.test test_assert2.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_assert2.py F

File doc/en/capture.txt

 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_module.py .F
     
     test_module.py:9: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    setting up <function test_func2 at 0x1439488>
+    setting up <function test_func2 at 0x2d63d70>
     ==================== 1 failed, 1 passed in 0.01 seconds ====================
 
 Accessing captured output from a test function

File doc/en/conf.py

 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = release = "2.3.2"
+version = release = "2.3.3"
 
 import sys, os
 

File doc/en/doctest.txt

 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     mymodule.py .

File doc/en/example/markers.txt

 
     $ py.test -v -m webtest
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
     test_server.py:3: test_send_http PASSED
     
     =================== 1 tests deselected by "-m 'webtest'" ===================
-    ================== 1 passed, 1 deselected in 0.01 seconds ==================
+    ================== 1 passed, 1 deselected in 0.02 seconds ==================
 
 Or the inverse, running all tests except the webtest ones::
     
     $ py.test -v -m "not webtest"
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
     test_server.py:6: test_something_quick PASSED
 
     $ py.test -k send_http  # running with the above defined examples
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_server.py .
 
     $ py.test -k-send_http
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_mark_classlevel.py ..
 
     $ py.test -kTestClass
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_mark_classlevel.py ..
 
     $ py.test -E stage2
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_someenv.py s
 
     $ py.test -E stage1
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_someenv.py .
 
     $ py.test -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_plat.py s.s.
     ========================= short test summary info ==========================
-    SKIP [2] /tmp/doc-exec-99/conftest.py:12: cannot run on platform linux2
+    SKIP [2] /tmp/doc-exec-57/conftest.py:12: cannot run on platform linux2
     
     =================== 2 passed, 2 skipped in 0.01 seconds ====================
 
 
     $ py.test -m linux2
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_plat.py .

File doc/en/example/nonpython.txt

 
     nonpython $ py.test test_simple.yml
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_simple.yml .F
     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.04 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
 
     nonpython $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
     test_simple.yml:1: usecase: ok PASSED
     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.04 seconds ====================
 
 While developing your custom test collection and execution it's also
 interesting to just look at the collection tree::
 
     nonpython $ py.test --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     <YamlFile 'test_simple.yml'>
       <YamlItem 'ok'>
       <YamlItem 'hello'>
     
-    =============================  in 0.02 seconds =============================
+    =============================  in 0.04 seconds =============================

File doc/en/example/parametrize.txt

 
     $ py.test test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_scenarios.py ....
 
     $ py.test --collectonly test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     <Module 'test_scenarios.py'>
       <Class 'TestSampleWithScenarios'>
 
     $ py.test test_backends.py --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     <Module 'test_backends.py'>
       <Function 'test_db_initialized[d1]'>
     ================================= FAILURES =================================
     _________________________ test_db_initialized[d2] __________________________
     
-    db = <conftest.DB2 instance at 0x216ccb0>
+    db = <conftest.DB2 instance at 0x1d8aef0>
     
         def test_db_initialized(db):
             # a dummy test
     ================================= FAILURES =================================
     ________________________ TestClass.test_equals[1-2] ________________________
     
-    self = <test_parametrize.TestClass instance at 0x216e8c0>, a = 1, b = 2
+    self = <test_parametrize.TestClass instance at 0x1628cb0>, a = 1, b = 2
     
         def test_equals(self, a, b):
     >       assert a == b

File doc/en/example/pythoncollection.txt

 
     $ py.test --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     <Module 'check_myapp.py'>
       <Class 'CheckMyApp'>
 
     . $ py.test --collectonly pythoncollection.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 3 items
     <Module 'pythoncollection.py'>
       <Function 'test_function'>
           <Function 'test_method'>
           <Function 'test_anothermethod'>
     
-    =============================  in 0.00 seconds =============================
+    =============================  in 0.01 seconds =============================
 
 customizing test collection to find all .py files
 ---------------------------------------------------------
     
     $ py.test --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     <Module 'pkg/module_py2.py'>
       <Function 'test_only_on_python2'>

File doc/en/example/reportingdemo.txt

 
     assertion $ py.test failure_demo.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 39 items
     
     failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
     failure_demo.py:15: AssertionError
     _________________________ TestFailing.test_simple __________________________
     
-    self = <failure_demo.TestFailing object at 0x11f1e50>
+    self = <failure_demo.TestFailing object at 0x1136710>
     
         def test_simple(self):
             def f():
         
     >       assert f() == g()
     E       assert 42 == 43
-    E        +  where 42 = <function f at 0x121a320>()
-    E        +  and   43 = <function g at 0x121a398>()
+    E        +  where 42 = <function f at 0x1146410>()
+    E        +  and   43 = <function g at 0x1146488>()
     
     failure_demo.py:28: AssertionError
     ____________________ TestFailing.test_simple_multiline _____________________
     
-    self = <failure_demo.TestFailing object at 0x118e8d0>
+    self = <failure_demo.TestFailing object at 0x11329d0>
     
         def test_simple_multiline(self):
             otherfunc_multi(
     failure_demo.py:11: AssertionError
     ___________________________ TestFailing.test_not ___________________________
     
-    self = <failure_demo.TestFailing object at 0x1186310>
+    self = <failure_demo.TestFailing object at 0x10d09d0>
     
         def test_not(self):
             def f():
                 return 42
     >       assert not f()
     E       assert not 42
-    E        +  where 42 = <function f at 0x121a668>()
+    E        +  where 42 = <function f at 0x1146848>()
     
     failure_demo.py:38: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_text _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11f2d90>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10ca210>
     
         def test_eq_text(self):
     >       assert 'spam' == 'eggs'
     failure_demo.py:42: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_similar_text _____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11e6b50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x11368d0>
     
         def test_eq_similar_text(self):
     >       assert 'foo 1 bar' == 'foo 2 bar'
     failure_demo.py:45: AssertionError
     ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1351ad0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x11340d0>
     
         def test_eq_multiline_text(self):
     >       assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
     failure_demo.py:48: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_long_text _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x118ee10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10cfd90>
     
         def test_eq_long_text(self):
             a = '1'*100 + 'a' + '2'*100
     failure_demo.py:53: AssertionError
     _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11f5d50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10d0b10>
     
         def test_eq_long_text_multiline(self):
             a = '1\n'*100 + 'a' + '2\n'*100
     failure_demo.py:58: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x118bc50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1142dd0>
     
         def test_eq_list(self):
     >       assert [0, 1, 2] == [0, 1, 3]
     failure_demo.py:61: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1186fd0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1136850>
     
         def test_eq_list_long(self):
             a = [0]*100 + [1] + [3]*100
     failure_demo.py:66: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11f1d10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1134e10>
     
         def test_eq_dict(self):
     >       assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2}
     failure_demo.py:69: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_set __________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x118b290>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1169c90>
     
         def test_eq_set(self):
     >       assert set([0, 10, 11, 12]) == set([0, 20, 21])
     failure_demo.py:72: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_longer_list ______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1351d90>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1142c50>
     
         def test_eq_longer_list(self):
     >       assert [1,2] == [1,2,3]
     failure_demo.py:75: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11f5fd0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10d0d90>
     
         def test_in_list(self):
     >       assert 1 in [0, 2, 3, 4, 5]
     failure_demo.py:78: AssertionError
     __________ TestSpecialisedExplanations.test_not_in_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x118ba10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10e0110>
     
         def test_not_in_text_multiline(self):
             text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail'
     failure_demo.py:82: AssertionError
     ___________ TestSpecialisedExplanations.test_not_in_text_single ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1351c90>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x10ca7d0>
     
         def test_not_in_text_single(self):
             text = 'single foo line'
     failure_demo.py:86: AssertionError
     _________ TestSpecialisedExplanations.test_not_in_text_single_long _________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x11f10d0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1142750>
     
         def test_not_in_text_single_long(self):
             text = 'head ' * 50 + 'foo ' + 'tail ' * 20
     failure_demo.py:90: AssertionError
     ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1351d50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1134410>
     
         def test_not_in_text_single_long_term(self):
             text = 'head ' * 50 + 'f'*70 + 'tail ' * 20
             i = Foo()
     >       assert i.b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x118b3d0>.b
+    E        +  where 1 = <failure_demo.Foo object at 0x10e07d0>.b
     
     failure_demo.py:101: AssertionError
     _________________________ test_attribute_instance __________________________
                 b = 1
     >       assert Foo().b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x11f5dd0>.b
-    E        +    where <failure_demo.Foo object at 0x11f5dd0> = <class 'failure_demo.Foo'>()
+    E        +  where 1 = <failure_demo.Foo object at 0x1132390>.b
+    E        +    where <failure_demo.Foo object at 0x1132390> = <class 'failure_demo.Foo'>()
     
     failure_demo.py:107: AssertionError
     __________________________ test_attribute_failure __________________________
     failure_demo.py:116: 
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
     
-    self = <failure_demo.Foo object at 0x1186a10>
+    self = <failure_demo.Foo object at 0x1136fd0>
     
         def _get_b(self):
     >       raise Exception('Failed to get attrib')
                 b = 2
     >       assert Foo().b == Bar().b
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x118eb50>.b
-    E        +    where <failure_demo.Foo object at 0x118eb50> = <class 'failure_demo.Foo'>()
-    E        +  and   2 = <failure_demo.Bar object at 0x118e090>.b
-    E        +    where <failure_demo.Bar object at 0x118e090> = <class 'failure_demo.Bar'>()
+    E        +  where 1 = <failure_demo.Foo object at 0x1134c50>.b
+    E        +    where <failure_demo.Foo object at 0x1134c50> = <class 'failure_demo.Foo'>()
+    E        +  and   2 = <failure_demo.Bar object at 0x1134790>.b
+    E        +    where <failure_demo.Bar object at 0x1134790> = <class 'failure_demo.Bar'>()
     
     failure_demo.py:124: AssertionError
     __________________________ TestRaises.test_raises __________________________
     
-    self = <failure_demo.TestRaises instance at 0x117fe60>
+    self = <failure_demo.TestRaises instance at 0x10dc098>
     
         def test_raises(self):
             s = 'qwe'
     >   int(s)
     E   ValueError: invalid literal for int() with base 10: 'qwe'
     
-    <0-codegen /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:851>:1: ValueError
+    <0-codegen /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:851>:1: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
     
-    self = <failure_demo.TestRaises instance at 0x1204170>
+    self = <failure_demo.TestRaises instance at 0x10d8320>
     
         def test_raises_doesnt(self):
     >       raises(IOError, "int('3')")
     failure_demo.py:136: Failed
     __________________________ TestRaises.test_raise ___________________________
     
-    self = <failure_demo.TestRaises instance at 0x1214710>
+    self = <failure_demo.TestRaises instance at 0x10c0680>
     
         def test_raise(self):
     >       raise ValueError("demo error")
     failure_demo.py:139: ValueError
     ________________________ TestRaises.test_tupleerror ________________________
     
-    self = <failure_demo.TestRaises instance at 0x12055f0>
+    self = <failure_demo.TestRaises instance at 0x11604d0>
     
         def test_tupleerror(self):
     >       a,b = [1]
     failure_demo.py:142: ValueError
     ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
     
-    self = <failure_demo.TestRaises instance at 0x11edef0>
+    self = <failure_demo.TestRaises instance at 0x10e2290>
     
         def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
             l = [1,2,3]
     l is [1, 2, 3]
     ________________________ TestRaises.test_some_error ________________________
     
-    self = <failure_demo.TestRaises instance at 0x11e3fc8>
+    self = <failure_demo.TestRaises instance at 0x10e2f80>
     
         def test_some_error(self):
     >       if namenotexi:
     <2-codegen 'abc-123' /home/hpk/p/pytest/doc/en/example/assertion/failure_demo.py:162>:2: AssertionError
     ____________________ TestMoreErrors.test_complex_error _____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x11e19e0>
+    self = <failure_demo.TestMoreErrors instance at 0x10d1b90>
     
         def test_complex_error(self):
             def f():
     failure_demo.py:5: AssertionError
     ___________________ TestMoreErrors.test_z1_unpack_error ____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x11e1c68>
+    self = <failure_demo.TestMoreErrors instance at 0x114f3b0>
     
         def test_z1_unpack_error(self):
             l = []
     failure_demo.py:179: ValueError
     ____________________ TestMoreErrors.test_z2_type_error _____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x12048c0>
+    self = <failure_demo.TestMoreErrors instance at 0x11496c8>
     
         def test_z2_type_error(self):
             l = 3
     failure_demo.py:183: TypeError
     ______________________ TestMoreErrors.test_startswith ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x11e9560>
+    self = <failure_demo.TestMoreErrors instance at 0x10cec20>
     
         def test_startswith(self):
             s = "123"
             g = "456"
     >       assert s.startswith(g)
-    E       assert <built-in method startswith of str object at 0x11f99b8>('456')
-    E        +  where <built-in method startswith of str object at 0x11f99b8> = '123'.startswith
+    E       assert <built-in method startswith of str object at 0x113b918>('456')
+    E        +  where <built-in method startswith of str object at 0x113b918> = '123'.startswith
     
     failure_demo.py:188: AssertionError
     __________________ TestMoreErrors.test_startswith_nested ___________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x1196bd8>
+    self = <failure_demo.TestMoreErrors instance at 0x10c87a0>
     
         def test_startswith_nested(self):
             def f():
             def g():
                 return "456"
     >       assert f().startswith(g())
-    E       assert <built-in method startswith of str object at 0x11f99b8>('456')
-    E        +  where <built-in method startswith of str object at 0x11f99b8> = '123'.startswith
-    E        +    where '123' = <function f at 0x120e938>()
-    E        +  and   '456' = <function g at 0x120e9b0>()
+    E       assert <built-in method startswith of str object at 0x113b918>('456')
+    E        +  where <built-in method startswith of str object at 0x113b918> = '123'.startswith
+    E        +    where '123' = <function f at 0x10bea28>()
+    E        +  and   '456' = <function g at 0x10beaa0>()
     
     failure_demo.py:195: AssertionError
     _____________________ TestMoreErrors.test_global_func ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x12147e8>
+    self = <failure_demo.TestMoreErrors instance at 0x10c5488>
     
         def test_global_func(self):
     >       assert isinstance(globf(42), float)
     failure_demo.py:198: AssertionError
     _______________________ TestMoreErrors.test_instance _______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x11e2e60>
+    self = <failure_demo.TestMoreErrors instance at 0x113f710>
     
         def test_instance(self):
             self.x = 6*7
     >       assert self.x != 42
     E       assert 42 != 42
-    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x11e2e60>.x
+    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x113f710>.x
     
     failure_demo.py:202: AssertionError
     _______________________ TestMoreErrors.test_compare ________________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x1216170>
+    self = <failure_demo.TestMoreErrors instance at 0x10bae18>
     
         def test_compare(self):
     >       assert globf(10) < 5
     failure_demo.py:205: AssertionError
     _____________________ TestMoreErrors.test_try_finally ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x1205050>
+    self = <failure_demo.TestMoreErrors instance at 0x1160248>
     
         def test_try_finally(self):
             x = 1
     E           assert 1 == 0
     
     failure_demo.py:210: AssertionError
-    ======================== 39 failed in 0.21 seconds =========================
+    ======================== 39 failed in 0.25 seconds =========================

File doc/en/example/simple.txt

 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 0 items
     
     =============================  in 0.00 seconds =============================
 
     $ py.test -rs    # "-rs" means report details on the little 's'
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-104/conftest.py:9: need --runslow option to run
+    SKIP [1] /tmp/doc-exec-62/conftest.py:9: need --runslow option to run
     
     =================== 1 passed, 1 skipped in 0.01 seconds ====================
 
 
     $ py.test --runslow
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_module.py ..
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     project deps: mylib-1.1
     collected 0 items
     
 
     $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     info1: did you know that ...
     did you?
     collecting ... collected 0 items
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 0 items
     
     =============================  in 0.00 seconds =============================
 
     $ py.test --durations=3
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 3 items
     
     test_some_are_slow.py ...
 
     $ py.test -rx
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 4 items
     
     test_step.py .Fx.
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
     
-    self = <test_step.TestUserHandling instance at 0x269efc8>
+    self = <test_step.TestUserHandling instance at 0x2677b90>
     
         def test_modification(self):
     >       assert 0
     ========================= short test summary info ==========================
     XFAIL test_step.py::TestUserHandling::()::test_deletion
       reason: previous test failed (test_modification)
-    ============== 1 failed, 2 passed, 1 xfailed in 0.01 seconds ===============
+    ============== 1 failed, 2 passed, 1 xfailed in 0.02 seconds ===============
 
 We'll see that ``test_deletion`` was not executed because ``test_modification``
 failed.  It is reported as an "expected failure".

File doc/en/fixture.txt

 
     $ py.test test_smtpsimple.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_smtpsimple.py F
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x16c2a28>
+    smtp = <smtplib.SMTP instance at 0x1992a70>
     
         def test_ehlo(smtp):
             response, msg = smtp.ehlo()
     E       assert 0
     
     test_smtpsimple.py:12: AssertionError
-    ========================= 1 failed in 0.16 seconds =========================
+    ========================= 1 failed in 0.30 seconds =========================
 
 In the failure traceback we see that the test function was called with a
 ``smtp`` argument, the ``smtplib.SMTP()`` instance created by the fixture
 
     $ py.test test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_module.py FF
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x23ccef0>
+    smtp = <smtplib.SMTP instance at 0x2b8a248>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:6: AssertionError
     ________________________________ test_noop _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x23ccef0>
+    smtp = <smtplib.SMTP instance at 0x2b8a248>
     
         def test_noop(smtp):
             response = smtp.noop()
     E       assert 0
     
     test_module.py:11: AssertionError
-    ========================= 2 failed in 0.17 seconds =========================
+    ========================= 2 failed in 0.48 seconds =========================
 
 You see the two ``assert 0`` failing and more importantly you can also see 
 that the same (module-scoped) ``smtp`` object was passed into the two 
 
     $ py.test -s -q --tb=no
     FF
-    finalizing <smtplib.SMTP instance at 0x2a6afc8>
+    finalizing <smtplib.SMTP instance at 0x1584908>
 
 We see that the ``smtp`` instance is finalized after the two
 tests using it tests executed.  If we had specified ``scope='function'`` 
     ================================= FAILURES =================================
     __________________________ test_ehlo[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x2191050>
+    smtp = <smtplib.SMTP instance at 0x2368248>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:6: AssertionError
     __________________________ test_noop[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x2191050>
+    smtp = <smtplib.SMTP instance at 0x2368248>
     
         def test_noop(smtp):
             response = smtp.noop()
     test_module.py:11: AssertionError
     ________________________ test_ehlo[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x22299e0>
+    smtp = <smtplib.SMTP instance at 0x2377680>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
     test_module.py:5: AssertionError
     ________________________ test_noop[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x22299e0>
+    smtp = <smtplib.SMTP instance at 0x2377680>
     
         def test_noop(smtp):
             response = smtp.noop()
 
     $ py.test -v test_appsetup.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
     test_appsetup.py:12: test_smtp_exists[merlinux.eu] PASSED
     test_appsetup.py:12: test_smtp_exists[mail.python.org] PASSED
     
-    ========================= 2 passed in 5.45 seconds =========================
+    ========================= 2 passed in 6.79 seconds =========================
 
 Due to the parametrization of ``smtp`` the test will run twice with two
 different ``App`` instances and respective smtp servers.  There is no
 
     $ py.test -v -s test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 8 items
     
     test_module.py:16: test_0[1] PASSED

File doc/en/getting-started.txt

 To check your installation has installed the correct version::
 
     $ py.test --version
-    This is py.test version 2.3.2, imported from /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.pyc
+    This is py.test version 2.3.3, imported from /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/pytest.pyc
 
 If you get an error checkout :ref:`installation issues`.
 
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_sample.py F
     ================================= FAILURES =================================
     ____________________________ TestClass.test_two ____________________________
     
-    self = <test_class.TestClass instance at 0x1e94c20>
+    self = <test_class.TestClass instance at 0x22a4d40>
     
         def test_two(self):
             x = "hello"
     ================================= FAILURES =================================
     _____________________________ test_needsfiles ______________________________
     
-    tmpdir = local('/tmp/pytest-917/test_needsfiles0')
+    tmpdir = local('/tmp/pytest-594/test_needsfiles0')
     
         def test_needsfiles(tmpdir):
             print tmpdir
     
     test_tmpdir.py:3: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    /tmp/pytest-917/test_needsfiles0
+    /tmp/pytest-594/test_needsfiles0
 
 Before the test runs, a unique-per-test-invocation temporary directory
 was created.  More info at :ref:`tmpdir handling`.

File doc/en/parametrize.txt

 
     $ py.test 
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 3 items
     
     test_expectation.py ..F
     
         def test_valid_string(stringinput):
     >       assert stringinput.isalpha()
-    E       assert <built-in method isalpha of str object at 0x2ada15bd2030>()
-    E        +  where <built-in method isalpha of str object at 0x2ada15bd2030> = '!'.isalpha
+    E       assert <built-in method isalpha of str object at 0x2b1792721fa8>()
+    E        +  where <built-in method isalpha of str object at 0x2b1792721fa8> = '!'.isalpha
     
     test_strings.py:3: AssertionError
 
     $ py.test -q -rs test_strings.py 
     s
     ========================= short test summary info ==========================
-    SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:960: got empty parameter set, function test_valid_string at /tmp/doc-exec-69/test_strings.py:1
+    SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:960: got empty parameter set, function test_valid_string at /tmp/doc-exec-26/test_strings.py:1
 
 For further examples, you might want to look at :ref:`more
 parametrization examples <paramexamples>`.

File doc/en/skipping.txt

 
     example $ py.test -rx xfail_demo.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 6 items
     
     xfail_demo.py xxxxxx
     XFAIL xfail_demo.py::test_hello6
       reason: reason
     
-    ======================== 6 xfailed in 0.04 seconds =========================
+    ======================== 6 xfailed in 0.05 seconds =========================
 
 .. _`evaluation of skipif/xfail conditions`:
 

File doc/en/tmpdir.txt

 
     $ py.test test_tmpdir.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 1 items
     
     test_tmpdir.py F
     ================================= FAILURES =================================
     _____________________________ test_create_file _____________________________
     
-    tmpdir = local('/tmp/pytest-918/test_create_file0')
+    tmpdir = local('/tmp/pytest-595/test_create_file0')
     
         def test_create_file(tmpdir):
             p = tmpdir.mkdir("sub").join("hello.txt")
     E       assert 0
     
     test_tmpdir.py:7: AssertionError
-    ========================= 1 failed in 0.04 seconds =========================
+    ========================= 1 failed in 0.03 seconds =========================
 
 .. _`base temporary directory`:
 

File doc/en/unittest.txt

 
     $ py.test test_unittest_db.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.2
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.3
     collected 2 items
     
     test_unittest_db.py FF
         def test_method1(self):
             assert hasattr(self, "db")
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x1f76290>
+    E       AssertionError: <conftest.DummyDB instance at 0x269e5a8>
     
     test_unittest_db.py:9: AssertionError
     ___________________________ MyTest.test_method2 ____________________________
     
         def test_method2(self):
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x1f76290>
+    E       AssertionError: <conftest.DummyDB instance at 0x269e5a8>
     
     test_unittest_db.py:12: AssertionError
     ========================= 2 failed in 0.02 seconds =========================
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.3.dev5',
+        version='2.3.3',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         entry_points= make_entry_points(),
         cmdclass = {'test': PyTest},
         # the following should be enabled for release
-        install_requires=['py>=1.4.12.dev2'],
+        install_requires=['py>=1.4.12'],
         classifiers=['Development Status :: 6 - Mature',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: MIT License',
 indexserver=
     pypi = http://pypi.python.org/simple
     testrun = http://pypi.testrun.org
-    default = http://pypi.testrun.org
+    #default = http://pypi.testrun.org
 
 [testenv]
 changedir=testing