release 2.3.5 packaging

_pytest/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '2.3.5.dev16'
+__version__ = '2.3.5'

doc/en/announce/release-2.3.5.txt

@@ -1,23 +1,61 @@
-pytest-2.3.5: bug fixes
+pytest-2.3.5: bug fixes and little improvements
 ===========================================================================
 
-pytest-2.3.5 is a bug fix release for the pytest testing tool.
+pytest-2.3.5 is a maintenance release with many bug fixes and little
-See the changelog below for details.  And 
+improvements.  See the changelog below for details.  No backward
+compatibility issues are foreseen and all plugins which worked with the
+prior version are expected to work unmodified.   Speaking of which, a
+few interesting new plugins saw the light last month:
+
+- pytest-instafail: show failure information while tests are running
+- pytest-qt: testing of GUI applications written with QT/Pyside
+- pytest-xprocess: managing external processes across test runs
+- pytest-random: randomize test ordering
+
+And several others like pytest-django saw maintenance releases.
+For a more complete list, check out 
+https://pypi.python.org/pypi?%3Aaction=search&term=pytest&submit=search.
+
+For general information see:
 
      http://pytest.org/
 
-for general information.  To install or upgrade pytest:
+To install or upgrade pytest:
 
     pip install -U pytest # or
     easy_install -U pytest
 
-best,
+Particular thanks to Floris, Ronny, Benjamin and the many bug reporters
+and fix providers.
+
+may the fixtures be with you,
 holger krekel
 
 
 Changes between 2.3.4 and 2.3.5
 -----------------------------------
 
+- never consider a fixture function for test function collection
+
+- allow re-running of test items / helps to fix pytest-reruntests plugin
+  and also help to keep less fixture/resource references alive
+
+- put captured stdout/stderr into junitxml output even for passing tests
+  (thanks Adam Goucher)
+
+- Issue 265 - integrate nose setup/teardown with setupstate
+  so it doesnt try to teardown if it did not setup
+
+- issue 271 - dont write junitxml on slave nodes
+
+- Issue 274 - dont try to show full doctest example
+  when doctest does not know the example location
+
+- issue 280 - disable assertion rewriting on buggy CPython 2.6.0
+
+- inject "getfixture()" helper to retrieve fixtures from doctests,
+  thanks Andreas Zeidler
+
 - issue 259 - when assertion rewriting, be consistent with the default
   source encoding of ASCII on Python 2
 
@@ -26,7 +64,7 @@ Changes between 2.3.4 and 2.3.5
 - issue250 unicode/str mixes in parametrization names and values now works
 
 - issue257, assertion-triggered compilation of source ending in a
-  comment line doesn't blow up in python2.5 (fixed through py>=1.4.13)
+  comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6)
 
 - fix --genscript option to generate standalone scripts that also
   work with python3.3 (importer ordering)

doc/en/assert.txt

@@ -26,7 +26,7 @@ you will see the return value of the function call::
 
     $ py.test test_assert1.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_assert1.py F
@@ -110,7 +110,7 @@ if you run this module::
 
     $ py.test test_assert2.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_assert2.py F

doc/en/capture.txt

@@ -64,7 +64,7 @@ of the failing function and hide the other one::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_module.py .F
@@ -78,7 +78,7 @@ of the failing function and hide the other one::
     
     test_module.py:9: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    setting up <function test_func2 at 0x1e12f50>
+    setting up <function test_func2 at 0x2d79f50>
     ==================== 1 failed, 1 passed in 0.01 seconds ====================
 
 Accessing captured output from a test function

doc/en/doctest.txt

@@ -44,7 +44,7 @@ then you can just invoke ``py.test`` without command line options::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     mymodule.py .

doc/en/example/markers.txt

@@ -28,7 +28,7 @@ You can then restrict a test run to only run tests marked with ``webtest``::
 
     $ py.test -v -m webtest
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
     
     test_server.py:3: test_send_http PASSED
@@ -40,7 +40,7 @@ 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.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
     
     test_server.py:6: test_something_quick PASSED
@@ -61,7 +61,7 @@ select tests based on their names::
 
     $ py.test -v -k http  # running with the above defined example module
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
     
     test_server.py:3: test_send_http PASSED
@@ -73,7 +73,7 @@ And you can also run all tests except the ones that match the keyword::
 
     $ py.test -k "not send_http" -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
     
     test_server.py:6: test_something_quick PASSED
@@ -86,7 +86,7 @@ Or to select "http" and "quick" tests::
 
     $ py.test -k "http or quick" -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
     
     test_server.py:3: test_send_http PASSED
@@ -232,7 +232,7 @@ the test needs::
 
     $ py.test -E stage2
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_someenv.py s
@@ -243,7 +243,7 @@ and here is one that specifies exactly the environment needed::
 
     $ py.test -E stage1
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_someenv.py .
@@ -360,12 +360,12 @@ then you will see two test skipped and two executed tests as expected::
 
     $ py.test -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 4 items
     
     test_plat.py s.s.
     ========================= short test summary info ==========================
-    SKIP [2] /tmp/doc-exec-133/conftest.py:12: cannot run on platform linux2
+    SKIP [2] /tmp/doc-exec-273/conftest.py:12: cannot run on platform linux2
     
     =================== 2 passed, 2 skipped in 0.01 seconds ====================
 
@@ -373,7 +373,7 @@ Note that if you specify a platform via the marker-command line option like this
 
     $ py.test -m linux2
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 4 items
     
     test_plat.py .
@@ -424,7 +424,7 @@ We can now use the ``-m option`` to select one set::
 
   $ py.test -m interface --tb=short
   =========================== test session starts ============================
-  platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+  platform linux2 -- Python 2.7.3 -- pytest-2.3.5
   collected 4 items
   
   test_module.py FF
@@ -445,7 +445,7 @@ or to select both "event" and "interface" tests::
 
   $ py.test -m "interface or event" --tb=short
   =========================== test session starts ============================
-  platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+  platform linux2 -- Python 2.7.3 -- pytest-2.3.5
   collected 4 items
   
   test_module.py FFF

doc/en/example/nonpython.txt

@@ -27,7 +27,7 @@ now execute the test specification::
 
     nonpython $ py.test test_simple.yml
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_simple.yml .F
@@ -37,7 +37,7 @@ now execute the test specification::
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ==================== 1 failed, 1 passed in 0.09 seconds ====================
+    ==================== 1 failed, 1 passed in 0.05 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 @@ consulted when reporting in ``verbose`` mode::
 
     nonpython $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
     test_simple.yml:1: usecase: ok PASSED
@@ -67,17 +67,17 @@ consulted when reporting in ``verbose`` mode::
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ==================== 1 failed, 1 passed in 0.04 seconds ====================
+    ==================== 1 failed, 1 passed in 0.05 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.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     <YamlFile 'test_simple.yml'>
       <YamlItem 'ok'>
       <YamlItem 'hello'>
     
-    =============================  in 0.04 seconds =============================
+    =============================  in 0.05 seconds =============================

doc/en/example/parametrize.txt

@@ -104,21 +104,19 @@ this is a fully self-contained example which you can run with::
 
     $ py.test test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.4.5dev3
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
-    plugins: xdist, oejskit, pep8, cache, couchdbkit, quickcheck
     collected 4 items
     
     test_scenarios.py ....
     
-    ========================= 4 passed in 0.04 seconds =========================
+    ========================= 4 passed in 0.01 seconds =========================
 
 If you just collect tests you'll also nicely see 'advanced' and 'basic' as variants for the test function::
 
 
     $ py.test --collectonly test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.4.5dev3
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
-    plugins: xdist, oejskit, pep8, cache, couchdbkit, quickcheck
     collected 4 items
     <Module 'test_scenarios.py'>
       <Class 'TestSampleWithScenarios'>
@@ -128,7 +126,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
           <Function 'test_demo1[advanced]'>
           <Function 'test_demo2[advanced]'>
     
-    =============================  in 0.03 seconds =============================
+    =============================  in 0.01 seconds =============================
 
 Note that we told ``metafunc.parametrize()`` that your scenario values
 should be considered class-scoped.  With pytest-2.3 this leads to a
@@ -182,14 +180,13 @@ Let's first see how it looks like at collection time::
 
     $ py.test test_backends.py --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.4.5dev3
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
-    plugins: xdist, oejskit, pep8, cache, couchdbkit, quickcheck
     collected 2 items
     <Module 'test_backends.py'>
       <Function 'test_db_initialized[d1]'>
       <Function 'test_db_initialized[d2]'>
     
-    =============================  in 0.03 seconds =============================
+    =============================  in 0.00 seconds =============================
 
 And then when we run the test::
 
@@ -198,7 +195,7 @@ And then when we run the test::
     ================================= FAILURES =================================
     _________________________ test_db_initialized[d2] __________________________
     
-    db = <conftest.DB2 instance at 0x19ba7e8>
+    db = <conftest.DB2 instance at 0x2038f80>
     
         def test_db_initialized(db):
             # a dummy test
@@ -253,7 +250,7 @@ argument sets to use for each test function.  Let's run it::
     ================================= FAILURES =================================
     ________________________ TestClass.test_equals[1-2] ________________________
     
-    self = <test_parametrize.TestClass instance at 0x2489b00>, a = 1, b = 2
+    self = <test_parametrize.TestClass instance at 0x1338f80>, a = 1, b = 2
     
         def test_equals(self, a, b):
     >       assert a == b
@@ -327,15 +324,14 @@ If you run this with reporting for skips enabled::
 
     $ py.test -rs test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.4.5dev3
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
-    plugins: xdist, oejskit, pep8, cache, couchdbkit, quickcheck
     collected 2 items
     
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-11/conftest.py:10: could not import 'opt2'
+    SKIP [1] /tmp/doc-exec-275/conftest.py:10: could not import 'opt2'
     
-    =================== 1 passed, 1 skipped in 0.04 seconds ====================
+    =================== 1 passed, 1 skipped in 0.01 seconds ====================
 
 You'll see that we don't have a ``opt2`` module and thus the second test run
 of our ``test_func1`` was skipped.  A few notes:

doc/en/example/pythoncollection.txt

@@ -43,7 +43,7 @@ then the test collection looks like this::
 
     $ py.test --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     <Module 'check_myapp.py'>
       <Class 'CheckMyApp'>
@@ -82,7 +82,7 @@ You can always peek at the collection tree without running tests like this::
 
     . $ py.test --collectonly pythoncollection.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 3 items
     <Module 'pythoncollection.py'>
       <Function 'test_function'>
@@ -135,7 +135,7 @@ interpreters and will leave out the setup.py file::
     
     $ py.test --collectonly
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     <Module 'pkg/module_py2.py'>
       <Function 'test_only_on_python2'>

doc/en/example/reportingdemo.txt

@@ -13,7 +13,7 @@ get on the terminal - we are working on that):
 
     assertion $ py.test failure_demo.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 39 items
     
     failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
@@ -30,7 +30,7 @@ get on the terminal - we are working on that):
     failure_demo.py:15: AssertionError
     _________________________ TestFailing.test_simple __________________________
     
-    self = <failure_demo.TestFailing object at 0x2ad4550>
+    self = <failure_demo.TestFailing object at 0x1445e10>
     
         def test_simple(self):
             def f():
@@ -40,13 +40,13 @@ get on the terminal - we are working on that):
         
     >       assert f() == g()
     E       assert 42 == 43
-    E        +  where 42 = <function f at 0x2a7f578>()
+    E        +  where 42 = <function f at 0x137c6e0>()
-    E        +  and   43 = <function g at 0x2a7f5f0>()
+    E        +  and   43 = <function g at 0x137c758>()
     
     failure_demo.py:28: AssertionError
     ____________________ TestFailing.test_simple_multiline _____________________
     
-    self = <failure_demo.TestFailing object at 0x2a81e50>
+    self = <failure_demo.TestFailing object at 0x135a1d0>
     
         def test_simple_multiline(self):
             otherfunc_multi(
@@ -66,19 +66,19 @@ get on the terminal - we are working on that):
     failure_demo.py:11: AssertionError
     ___________________________ TestFailing.test_not ___________________________
     
-    self = <failure_demo.TestFailing object at 0x2a72b50>
+    self = <failure_demo.TestFailing object at 0x1458ed0>
     
         def test_not(self):
             def f():
                 return 42
     >       assert not f()
     E       assert not 42
-    E        +  where 42 = <function f at 0x2a7f9b0>()
+    E        +  where 42 = <function f at 0x137caa0>()
     
     failure_demo.py:38: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_text _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a6eb50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x14451d0>
     
         def test_eq_text(self):
     >       assert 'spam' == 'eggs'
@@ -89,7 +89,7 @@ get on the terminal - we are working on that):
     failure_demo.py:42: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_similar_text _____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2b07cd0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1458c90>
     
         def test_eq_similar_text(self):
     >       assert 'foo 1 bar' == 'foo 2 bar'
@@ -102,7 +102,7 @@ get on the terminal - we are working on that):
     failure_demo.py:45: AssertionError
     ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a68050>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1434390>
     
         def test_eq_multiline_text(self):
     >       assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
@@ -115,15 +115,15 @@ get on the terminal - we are working on that):
     failure_demo.py:48: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_long_text _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2990>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1459f50>
     
         def test_eq_long_text(self):
             a = '1'*100 + 'a' + '2'*100
             b = '1'*100 + 'b' + '2'*100
     >       assert a == b
     E       assert '111111111111...2222222222222' == '1111111111111...2222222222222'
-    E         Skipping 90 identical leading characters in diff
+    E         Skipping 90 identical leading characters in diff, use -v to show
-    E         Skipping 91 identical trailing characters in diff
+    E         Skipping 91 identical trailing characters in diff, use -v to show
     E         - 1111111111a222222222
     E         ?           ^
     E         + 1111111111b222222222
@@ -132,15 +132,15 @@ get on the terminal - we are working on that):
     failure_demo.py:53: AssertionError
     _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad6c10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x135a790>
     
         def test_eq_long_text_multiline(self):
             a = '1\n'*100 + 'a' + '2\n'*100
             b = '1\n'*100 + 'b' + '2\n'*100
     >       assert a == b
     E       assert '1\n1\n1\n1\n...n2\n2\n2\n2\n' == '1\n1\n1\n1\n1...n2\n2\n2\n2\n'
-    E         Skipping 190 identical leading characters in diff
+    E         Skipping 190 identical leading characters in diff, use -v to show
-    E         Skipping 191 identical trailing characters in diff
+    E         Skipping 191 identical trailing characters in diff, use -v to show
     E           1
     E           1
     E           1
@@ -156,7 +156,7 @@ get on the terminal - we are working on that):
     failure_demo.py:58: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a81c50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x138dfd0>
     
         def test_eq_list(self):
     >       assert [0, 1, 2] == [0, 1, 3]
@@ -166,7 +166,7 @@ get on the terminal - we are working on that):
     failure_demo.py:61: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a69f50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x135a990>
     
         def test_eq_list_long(self):
             a = [0]*100 + [1] + [3]*100
@@ -178,20 +178,23 @@ get on the terminal - we are working on that):
     failure_demo.py:66: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad5f50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1459310>
     
         def test_eq_dict(self):
-    >       assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2}
+    >       assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
-    E       assert {'a': 0, 'b': 1} == {'a': 0, 'b': 2}
+    E       assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
-    E         - {'a': 0, 'b': 1}
+    E         Hiding 1 identical items, use -v to show
-    E         ?               ^
+    E         Differing items:
-    E         + {'a': 0, 'b': 2}
+    E         {'b': 1} != {'b': 2}
-    E         ?               ^
+    E         Left contains more items:
+    E         {'c': 0}
+    E         Right contains more items:
+    E         {'d': 0}
     
     failure_demo.py:69: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_set __________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad4410>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1434310>
     
         def test_eq_set(self):
     >       assert set([0, 10, 11, 12]) == set([0, 20, 21])
@@ -207,7 +210,7 @@ get on the terminal - we are working on that):
     failure_demo.py:72: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_longer_list ______________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2d50>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x138ded0>
     
         def test_eq_longer_list(self):
     >       assert [1,2] == [1,2,3]
@@ -217,7 +220,7 @@ get on the terminal - we are working on that):
     failure_demo.py:75: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a81310>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1459e10>
     
         def test_in_list(self):
     >       assert 1 in [0, 2, 3, 4, 5]
@@ -226,7 +229,7 @@ get on the terminal - we are working on that):
     failure_demo.py:78: AssertionError
     __________ TestSpecialisedExplanations.test_not_in_text_multiline __________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a697d0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1434950>
     
         def test_not_in_text_multiline(self):
             text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail'
@@ -244,7 +247,7 @@ get on the terminal - we are working on that):
     failure_demo.py:82: AssertionError
     ___________ TestSpecialisedExplanations.test_not_in_text_single ____________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad4d10>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x138dbd0>
     
         def test_not_in_text_single(self):
             text = 'single foo line'
@@ -257,7 +260,7 @@ get on the terminal - we are working on that):
     failure_demo.py:86: AssertionError
     _________ TestSpecialisedExplanations.test_not_in_text_single_long _________
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2ad2fd0>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x14593d0>
     
         def test_not_in_text_single_long(self):
             text = 'head ' * 50 + 'foo ' + 'tail ' * 20
@@ -270,7 +273,7 @@ get on the terminal - we are working on that):
     failure_demo.py:90: AssertionError
     ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
     
-    self = <failure_demo.TestSpecialisedExplanations object at 0x2a6f410>
+    self = <failure_demo.TestSpecialisedExplanations object at 0x1459650>
     
         def test_not_in_text_single_long_term(self):
             text = 'head ' * 50 + 'f'*70 + 'tail ' * 20
@@ -289,7 +292,7 @@ get on the terminal - we are working on that):
             i = Foo()
     >       assert i.b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x2a81850>.b
+    E        +  where 1 = <failure_demo.Foo object at 0x1434850>.b
     
     failure_demo.py:101: AssertionError
     _________________________ test_attribute_instance __________________________
@@ -299,8 +302,8 @@ get on the terminal - we are working on that):
                 b = 1
     >       assert Foo().b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x2ad4bd0>.b
+    E        +  where 1 = <failure_demo.Foo object at 0x1459dd0>.b
-    E        +    where <failure_demo.Foo object at 0x2ad4bd0> = <class 'failure_demo.Foo'>()
+    E        +    where <failure_demo.Foo object at 0x1459dd0> = <class 'failure_demo.Foo'>()
     
     failure_demo.py:107: AssertionError
     __________________________ test_attribute_failure __________________________
@@ -316,7 +319,7 @@ get on the terminal - we are working on that):
     failure_demo.py:116: 
     _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
     
-    self = <failure_demo.Foo object at 0x2ad26d0>
+    self = <failure_demo.Foo object at 0x1434150>
     
         def _get_b(self):
     >       raise Exception('Failed to get attrib')
@@ -332,15 +335,15 @@ get on the terminal - we are working on that):
                 b = 2
     >       assert Foo().b == Bar().b
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x2a6ff10>.b
+    E        +  where 1 = <failure_demo.Foo object at 0x14590d0>.b
-    E        +    where <failure_demo.Foo object at 0x2a6ff10> = <class 'failure_demo.Foo'>()
+    E        +    where <failure_demo.Foo object at 0x14590d0> = <class 'failure_demo.Foo'>()
-    E        +  and   2 = <failure_demo.Bar object at 0x2a6fd50>.b
+    E        +  and   2 = <failure_demo.Bar object at 0x1459b10>.b
-    E        +    where <failure_demo.Bar object at 0x2a6fd50> = <class 'failure_demo.Bar'>()
+    E        +    where <failure_demo.Bar object at 0x1459b10> = <class 'failure_demo.Bar'>()
     
     failure_demo.py:124: AssertionError
     __________________________ TestRaises.test_raises __________________________
     
-    self = <failure_demo.TestRaises instance at 0x2a75c68>
+    self = <failure_demo.TestRaises instance at 0x13a0d88>
     
         def test_raises(self):
             s = 'qwe'
@@ -352,10 +355,10 @@ get on the terminal - we are working on that):
     >   int(s)
     E   ValueError: invalid literal for int() with base 10: 'qwe'
     
-    <0-codegen /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:851>:1: ValueError
+    <0-codegen /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:858>:1: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
     
-    self = <failure_demo.TestRaises instance at 0x2adf3f8>
+    self = <failure_demo.TestRaises instance at 0x145fcf8>
     
         def test_raises_doesnt(self):
     >       raises(IOError, "int('3')")
@@ -364,7 +367,7 @@ get on the terminal - we are working on that):
     failure_demo.py:136: Failed
     __________________________ TestRaises.test_raise ___________________________
     
-    self = <failure_demo.TestRaises instance at 0x2af1830>
+    self = <failure_demo.TestRaises instance at 0x13a9ea8>
     
         def test_raise(self):
     >       raise ValueError("demo error")
@@ -373,7 +376,7 @@ get on the terminal - we are working on that):
     failure_demo.py:139: ValueError
     ________________________ TestRaises.test_tupleerror ________________________
     
-    self = <failure_demo.TestRaises instance at 0x2ae5290>
+    self = <failure_demo.TestRaises instance at 0x13843f8>
     
         def test_tupleerror(self):
     >       a,b = [1]
@@ -382,7 +385,7 @@ get on the terminal - we are working on that):
     failure_demo.py:142: ValueError
     ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
     
-    self = <failure_demo.TestRaises instance at 0x2ae2878>
+    self = <failure_demo.TestRaises instance at 0x14532d8>
     
         def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
             l = [1,2,3]
@@ -395,7 +398,7 @@ get on the terminal - we are working on that):
     l is [1, 2, 3]
     ________________________ TestRaises.test_some_error ________________________
     
-    self = <failure_demo.TestRaises instance at 0x2af0e18>
+    self = <failure_demo.TestRaises instance at 0x139d290>
     
         def test_some_error(self):
     >       if namenotexi:
@@ -423,7 +426,7 @@ get on the terminal - we are working on that):
     <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 0x2adbc68>
+    self = <failure_demo.TestMoreErrors instance at 0x137d758>
     
         def test_complex_error(self):
             def f():
@@ -452,7 +455,7 @@ get on the terminal - we are working on that):
     failure_demo.py:5: AssertionError
     ___________________ TestMoreErrors.test_z1_unpack_error ____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2aee1b8>
+    self = <failure_demo.TestMoreErrors instance at 0x13a5200>
     
         def test_z1_unpack_error(self):
             l = []
@@ -462,7 +465,7 @@ get on the terminal - we are working on that):
     failure_demo.py:179: ValueError
     ____________________ TestMoreErrors.test_z2_type_error _____________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2ae27a0>
+    self = <failure_demo.TestMoreErrors instance at 0x1395290>
     
         def test_z2_type_error(self):
             l = 3
@@ -472,19 +475,19 @@ get on the terminal - we are working on that):
     failure_demo.py:183: TypeError
     ______________________ TestMoreErrors.test_startswith ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2ae1128>
+    self = <failure_demo.TestMoreErrors instance at 0x137f200>
     
         def test_startswith(self):
             s = "123"
             g = "456"
     >       assert s.startswith(g)
-    E       assert <built-in method startswith of str object at 0x2adc918>('456')
+    E       assert <built-in method startswith of str object at 0x143f288>('456')
-    E        +  where <built-in method startswith of str object at 0x2adc918> = '123'.startswith
+    E        +  where <built-in method startswith of str object at 0x143f288> = '123'.startswith
     
     failure_demo.py:188: AssertionError
     __________________ TestMoreErrors.test_startswith_nested ___________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2c720e0>
+    self = <failure_demo.TestMoreErrors instance at 0x145fb00>
     
         def test_startswith_nested(self):
             def f():
@@ -492,15 +495,15 @@ get on the terminal - we are working on that):
             def g():
                 return "456"
     >       assert f().startswith(g())
-    E       assert <built-in method startswith of str object at 0x2adc918>('456')
+    E       assert <built-in method startswith of str object at 0x143f288>('456')
-    E        +  where <built-in method startswith of str object at 0x2adc918> = '123'.startswith
+    E        +  where <built-in method startswith of str object at 0x143f288> = '123'.startswith
-    E        +    where '123' = <function f at 0x2af5b90>()
+    E        +    where '123' = <function f at 0x13abaa0>()
-    E        +  and   '456' = <function g at 0x2af5c08>()
+    E        +  and   '456' = <function g at 0x13ab578>()
     
     failure_demo.py:195: AssertionError
     _____________________ TestMoreErrors.test_global_func ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2c725f0>
+    self = <failure_demo.TestMoreErrors instance at 0x139cd40>
     
         def test_global_func(self):
     >       assert isinstance(globf(42), float)
@@ -510,18 +513,18 @@ get on the terminal - we are working on that):
     failure_demo.py:198: AssertionError
     _______________________ TestMoreErrors.test_instance _______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2a67ab8>
+    self = <failure_demo.TestMoreErrors instance at 0x13593b0>
     
         def test_instance(self):
             self.x = 6*7
     >       assert self.x != 42
     E       assert 42 != 42
-    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x2a67ab8>.x
+    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x13593b0>.x
     
     failure_demo.py:202: AssertionError
     _______________________ TestMoreErrors.test_compare ________________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2af8710>
+    self = <failure_demo.TestMoreErrors instance at 0x1465d40>
     
         def test_compare(self):
     >       assert globf(10) < 5
@@ -531,7 +534,7 @@ get on the terminal - we are working on that):
     failure_demo.py:205: AssertionError
     _____________________ TestMoreErrors.test_try_finally ______________________
     
-    self = <failure_demo.TestMoreErrors instance at 0x2af03f8>
+    self = <failure_demo.TestMoreErrors instance at 0x1456ea8>
     
         def test_try_finally(self):
             x = 1
@@ -540,4 +543,4 @@ get on the terminal - we are working on that):
     E           assert 1 == 0
     
     failure_demo.py:210: AssertionError
-    ======================== 39 failed in 0.25 seconds =========================
+    ======================== 39 failed in 0.21 seconds =========================

doc/en/example/simple.txt

@@ -106,7 +106,7 @@ directory with the above conftest.py::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 0 items
     
     =============================  in 0.00 seconds =============================
@@ -150,12 +150,12 @@ and when running it will see a skipped "slow" test::
 
     $ py.test -rs    # "-rs" means report details on the little 's'
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-138/conftest.py:9: need --runslow option to run
+    SKIP [1] /tmp/doc-exec-278/conftest.py:9: need --runslow option to run
     
     =================== 1 passed, 1 skipped in 0.01 seconds ====================
 
@@ -163,7 +163,7 @@ Or run it including the ``slow`` marked test::
 
     $ py.test --runslow
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_module.py ..
@@ -253,7 +253,7 @@ which will add the string to the test header accordingly::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     project deps: mylib-1.1
     collected 0 items
     
@@ -276,7 +276,7 @@ which will add info only when run with "--v"::
 
     $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     info1: did you know that ...
     did you?
     collecting ... collected 0 items
@@ -287,7 +287,7 @@ and nothing when run plainly::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 0 items
     
     =============================  in 0.00 seconds =============================
@@ -319,7 +319,7 @@ Now we can profile which test functions execute the slowest::
 
     $ py.test --durations=3
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 3 items
     
     test_some_are_slow.py ...
@@ -327,7 +327,7 @@ Now we can profile which test functions execute the slowest::
     ========================= 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 call     test_some_are_slow.py::test_funcfast
+    0.00s setup    test_some_are_slow.py::test_funcfast
     ========================= 3 passed in 0.31 seconds =========================
 
 incremental testing - test steps
@@ -380,7 +380,7 @@ If we run this::
 
     $ py.test -rx
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 4 items
     
     test_step.py .Fx.
@@ -388,7 +388,7 @@ If we run this::
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
     
-    self = <test_step.TestUserHandling instance at 0x193bc68>
+    self = <test_step.TestUserHandling instance at 0x282b8c0>
     
         def test_modification(self):
     >       assert 0
@@ -398,7 +398,7 @@ If we run this::
     ========================= 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.02 seconds ===============
+    ============== 1 failed, 2 passed, 1 xfailed in 0.01 seconds ===============
 
 We'll see that ``test_deletion`` was not executed because ``test_modification``
 failed.  It is reported as an "expected failure".
@@ -450,7 +450,7 @@ We can run this::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 7 items
     
     test_step.py .Fx.
@@ -460,17 +460,17 @@ We can run this::
     
     ================================== ERRORS ==================================
     _______________________ ERROR at setup of test_root ________________________
-    file /tmp/doc-exec-138/b/test_error.py, line 1
+    file /tmp/doc-exec-278/b/test_error.py, line 1
       def test_root(db):  # no db here, will error out
             fixture 'db' not found
             available fixtures: pytestconfig, recwarn, monkeypatch, capfd, capsys, tmpdir
             use 'py.test --fixtures [testpath]' for help on them.
     
-    /tmp/doc-exec-138/b/test_error.py:1
+    /tmp/doc-exec-278/b/test_error.py:1
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
     
-    self = <test_step.TestUserHandling instance at 0x1492d88>
+    self = <test_step.TestUserHandling instance at 0x26145f0>
     
         def test_modification(self):
     >       assert 0
@@ -479,23 +479,23 @@ We can run this::
     test_step.py:9: AssertionError
     _________________________________ test_a1 __________________________________
     
-    db = <conftest.DB instance at 0x1498e60>
+    db = <conftest.DB instance at 0x26211b8>
     
         def test_a1(db):
     >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB instance at 0x1498e60>
+    E       AssertionError: <conftest.DB instance at 0x26211b8>
     
     a/test_db.py:2: AssertionError
     _________________________________ test_a2 __________________________________
     
-    db = <conftest.DB instance at 0x1498e60>
+    db = <conftest.DB instance at 0x26211b8>
     
         def test_a2(db):
     >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB instance at 0x1498e60>
+    E       AssertionError: <conftest.DB instance at 0x26211b8>
     
     a/test_db2.py:2: AssertionError
-    ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.04 seconds ==========
+    ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.03 seconds ==========
 
 The two test modules in the ``a`` directory see the same ``db`` fixture instance
 while the one test in the sister-directory ``b`` doesn't see it.  We could of course
@@ -550,7 +550,7 @@ and run them::
 
     $ py.test test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_module.py FF
@@ -558,7 +558,7 @@ and run them::
     ================================= FAILURES =================================
     ________________________________ test_fail1 ________________________________
     
-    tmpdir = local('/tmp/pytest-543/test_fail10')
+    tmpdir = local('/tmp/pytest-326/test_fail10')
     
         def test_fail1(tmpdir):
     >       assert 0
@@ -577,7 +577,7 @@ and run them::
 you will have a "failures" file which contains the failing test ids::
 
     $ cat failures
-    test_module.py::test_fail1 (/tmp/pytest-543/test_fail10)
+    test_module.py::test_fail1 (/tmp/pytest-326/test_fail10)
     test_module.py::test_fail2
 
 Making test result information available in fixtures
@@ -640,7 +640,7 @@ and run it::
 
     $ py.test -s test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 3 items
     
     test_module.py EFF

doc/en/fixture.txt

@@ -71,7 +71,7 @@ marked ``smtp`` fixture function.  Running the test looks like this::
 
     $ py.test test_smtpsimple.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_smtpsimple.py F
@@ -79,7 +79,7 @@ marked ``smtp`` fixture function.  Running the test looks like this::
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x236cab8>
+    smtp = <smtplib.SMTP instance at 0x226cc20>
     
         def test_ehlo(smtp):
             response, msg = smtp.ehlo()
@@ -89,7 +89,7 @@ marked ``smtp`` fixture function.  Running the test looks like this::
     E       assert 0
     
     test_smtpsimple.py:12: AssertionError
-    ========================= 1 failed in 0.17 seconds =========================
+    ========================= 1 failed in 0.20 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
@@ -189,7 +189,7 @@ inspect what is going on and can now run the tests::
 
     $ py.test test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_module.py FF
@@ -197,7 +197,7 @@ inspect what is going on and can now run the tests::
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x1c9add0>
+    smtp = <smtplib.SMTP instance at 0x18a6368>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
@@ -209,7 +209,7 @@ inspect what is going on and can now run the tests::
     test_module.py:6: AssertionError
     ________________________________ test_noop _________________________________
     
-    smtp = <smtplib.SMTP instance at 0x1c9add0>
+    smtp = <smtplib.SMTP instance at 0x18a6368>
     
         def test_noop(smtp):
             response = smtp.noop()
@@ -218,7 +218,7 @@ inspect what is going on and can now run the tests::
     E       assert 0
     
     test_module.py:11: AssertionError
-    ========================= 2 failed in 0.23 seconds =========================
+    ========================= 2 failed in 0.26 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 
@@ -271,7 +271,7 @@ using it has executed::
 
     $ py.test -s -q --tb=no
     FF
-    finalizing <smtplib.SMTP instance at 0x2720290>
+    finalizing <smtplib.SMTP instance at 0x1e10248>
 
 We see that the ``smtp`` instance is finalized after the two
 tests using it tests executed.  If we had specified ``scope='function'`` 
@@ -298,7 +298,6 @@ Running it::
     >       assert 0, smtp.helo()
     E       AssertionError: (250, 'mail.python.org')
 
-
 .. _`fixture-parametrize`:
 
 Parametrizing a fixture
@@ -341,7 +340,7 @@ So let's just do another run::
     ================================= FAILURES =================================
     __________________________ test_ehlo[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x1dae368>
+    smtp = <smtplib.SMTP instance at 0x1b38a28>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
@@ -353,7 +352,7 @@ So let's just do another run::
     test_module.py:6: AssertionError
     __________________________ test_noop[merlinux.eu] __________________________
     
-    smtp = <smtplib.SMTP instance at 0x1dae368>
+    smtp = <smtplib.SMTP instance at 0x1b38a28>
     
         def test_noop(smtp):
             response = smtp.noop()
@@ -364,18 +363,18 @@ So let's just do another run::
     test_module.py:11: AssertionError
     ________________________ test_ehlo[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x1dbc7a0>
+    smtp = <smtplib.SMTP instance at 0x1b496c8>
     
         def test_ehlo(smtp):
             response = smtp.ehlo()
             assert response[0] == 250
     >       assert "merlinux" in response[1]
-    E       assert 'merlinux' in 'mail.python.org\nSIZE 10240000\nETRN\nSTARTTLS\nENHANCEDSTATUSCODES\n8BITMIME\nDSN'
+    E       assert 'merlinux' in 'mail.python.org\nSIZE 25600000\nETRN\nSTARTTLS\nENHANCEDSTATUSCODES\n8BITMIME\nDSN'
     
     test_module.py:5: AssertionError
     ________________________ test_noop[mail.python.org] ________________________
     
-    smtp = <smtplib.SMTP instance at 0x1dbc7a0>
+    smtp = <smtplib.SMTP instance at 0x1b496c8>
     
         def test_noop(smtp):
             response = smtp.noop()
@@ -423,13 +422,13 @@ Here we declare an ``app`` fixture which receives the previously defined
 
     $ py.test -v test_appsetup.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /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.95 seconds =========================
+    ========================= 2 passed in 5.38 seconds =========================
 
 Due to the parametrization of ``smtp`` the test will run twice with two
 different ``App`` instances and respective smtp servers.  There is no
@@ -488,7 +487,7 @@ Let's run the tests in verbose mode and with looking at the print-output::
 
     $ py.test -v -s test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 8 items
     
     test_module.py:16: test_0[1] PASSED

doc/en/getting-started.txt

@@ -23,7 +23,7 @@ Installation options::
 To check your installation has installed the correct version::
 
     $ py.test --version
-    This is py.test version 2.3.4, imported from /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/pytest.pyc
+    This is py.test version 2.3.5, imported from /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.py
 
 If you get an error checkout :ref:`installation issues`.
 
@@ -45,7 +45,7 @@ That's it. You can execute the test function now::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_sample.py F
@@ -122,7 +122,7 @@ run the module by passing its filename::
     ================================= FAILURES =================================
     ____________________________ TestClass.test_two ____________________________
     
-    self = <test_class.TestClass instance at 0x2418e18>
+    self = <test_class.TestClass instance at 0x315b488>
     
         def test_two(self):
             x = "hello"
@@ -157,7 +157,7 @@ before performing the test function call.  Let's just run it::
     ================================= FAILURES =================================
     _____________________________ test_needsfiles ______________________________
     
-    tmpdir = local('/tmp/pytest-539/test_needsfiles0')
+    tmpdir = local('/tmp/pytest-322/test_needsfiles0')
     
         def test_needsfiles(tmpdir):
             print tmpdir
@@ -166,7 +166,7 @@ before performing the test function call.  Let's just run it::
     
     test_tmpdir.py:3: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    /tmp/pytest-539/test_needsfiles0
+    /tmp/pytest-322/test_needsfiles0
 
 Before the test runs, a unique-per-test-invocation temporary directory
 was created.  More info at :ref:`tmpdir handling`.

doc/en/parametrize.txt

@@ -53,7 +53,7 @@ which will thus run three times::
 
     $ py.test 
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 3 items
     
     test_expectation.py ..F
@@ -135,8 +135,8 @@ Let's also run with a stringinput that will lead to a failing test::
     
         def test_valid_string(stringinput):
     >       assert stringinput.isalpha()
-    E       assert <built-in method isalpha of str object at 0x2b2319ceffa8>()
+    E       assert <built-in method isalpha of str object at 0x2ba729dab300>()
-    E        +  where <built-in method isalpha of str object at 0x2b2319ceffa8> = '!'.isalpha
+    E        +  where <built-in method isalpha of str object at 0x2ba729dab300> = '!'.isalpha
     
     test_strings.py:3: AssertionError
 
@@ -149,7 +149,7 @@ listlist::
     $ py.test -q -rs test_strings.py 
     s
     ========================= short test summary info ==========================
-    SKIP [1] /home/hpk/p/pytest/.tox/regen/lib/python2.7/site-packages/_pytest/python.py:962: got empty parameter set, function test_valid_string at /tmp/doc-exec-101/test_strings.py:1
+    SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:974: got empty parameter set, function test_valid_string at /tmp/doc-exec-240/test_strings.py:1
 
 For further examples, you might want to look at :ref:`more
 parametrization examples <paramexamples>`.

doc/en/skipping.txt

@@ -132,7 +132,7 @@ Running it with the report-on-xfail option gives this output::
 
     example $ py.test -rx xfail_demo.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 6 items
     
     xfail_demo.py xxxxxx

doc/en/tmpdir.txt

@@ -29,7 +29,7 @@ Running this would result in a passed test except for the last
 
     $ py.test test_tmpdir.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 1 items
     
     test_tmpdir.py F
@@ -37,7 +37,7 @@ Running this would result in a passed test except for the last
     ================================= FAILURES =================================
     _____________________________ test_create_file _____________________________
     
-    tmpdir = local('/tmp/pytest-540/test_create_file0')
+    tmpdir = local('/tmp/pytest-323/test_create_file0')
     
         def test_create_file(tmpdir):
             p = tmpdir.mkdir("sub").join("hello.txt")

doc/en/unittest.txt

@@ -88,7 +88,7 @@ the ``self.db`` values in the traceback::
 
     $ py.test test_unittest_db.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.3.4
+    platform linux2 -- Python 2.7.3 -- pytest-2.3.5
     collected 2 items
     
     test_unittest_db.py FF
@@ -101,7 +101,7 @@ the ``self.db`` values in the traceback::
         def test_method1(self):
             assert hasattr(self, "db")
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x19be7e8>
+    E       AssertionError: <conftest.DummyDB instance at 0x19fdf38>
     
     test_unittest_db.py:9: AssertionError
     ___________________________ MyTest.test_method2 ____________________________
@@ -110,7 +110,7 @@ the ``self.db`` values in the traceback::
     
         def test_method2(self):
     >       assert 0, self.db   # fail for demo purposes
-    E       AssertionError: <conftest.DummyDB instance at 0x19be7e8>
+    E       AssertionError: <conftest.DummyDB instance at 0x19fdf38>
     
     test_unittest_db.py:12: AssertionError
     ========================= 2 failed in 0.02 seconds =========================

setup.py

@@ -12,7 +12,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.3.5.dev16',
+        version='2.3.5',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],