[Pytest-commit] commit/pytest: 4 new changesets

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Wed Jan 29 13:47:24 CET 2014


4 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/375d0e5f1395/
Changeset:   375d0e5f1395
User:        hpk42
Date:        2014-01-29 11:18:15
Summary:     refactor lsof checking and fix an lsof leak in pypy
Affected #:  1 file

diff -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c -r 375d0e5f139590c1fb9700c113c0f44f2fd72497 testing/test_capture.py
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -5,6 +5,7 @@
 import sys
 import py
 import pytest
+import contextlib
 
 from _pytest import capture
 from _pytest.capture import CaptureManager
@@ -121,9 +122,10 @@
             capouter.reset()
 
 
- at pytest.mark.xfail("hasattr(sys, 'pypy_version_info')")
 @pytest.mark.parametrize("method", ['fd', 'sys'])
 def test_capturing_unicode(testdir, method):
+    if hasattr(sys, "pypy_version_info") and sys.pypy_version_info < (2,2):
+        pytest.xfail("does not work on pypy < 2.2")
     if sys.version_info >= (3, 0):
         obj = "'b\u00f6y'"
     else:
@@ -605,12 +607,12 @@
     f.close()  # just for completeness
 
 
-def pytest_funcarg__tmpfile(request):
-    testdir = request.getfuncargvalue("testdir")
+ at pytest.yield_fixture
+def tmpfile(testdir):
     f = testdir.makepyfile("").open('wb+')
-    request.addfinalizer(f.close)
-    return f
-
+    yield f
+    if not f.closed:
+        f.close()
 
 @needsosdup
 def test_dupfile(tmpfile):
@@ -645,13 +647,14 @@
         capture.dupfile(tmpfile, raising=True)
 
 
-def lsof_check(func):
+ at contextlib.contextmanager
+def lsof_check():
     pid = os.getpid()
     try:
         out = py.process.cmdexec("lsof -p %d" % pid)
     except py.process.cmdexec.Error:
         pytest.skip("could not run 'lsof'")
-    func()
+    yield
     out2 = py.process.cmdexec("lsof -p %d" % pid)
     len1 = len([x for x in out.split("\n") if "REG" in x])
     len2 = len([x for x in out2.split("\n") if "REG" in x])
@@ -668,6 +671,7 @@
         os.write(fd, data)
         f = cap.done()
         s = f.read()
+        f.close()
         assert not s
         cap = capture.FDCapture(fd)
         cap.start()
@@ -675,13 +679,16 @@
         f = cap.done()
         s = f.read()
         assert s == "hello"
+        f.close()
 
     def test_simple_many(self, tmpfile):
         for i in range(10):
             self.test_simple(tmpfile)
 
-    def test_simple_many_check_open_files(self, tmpfile):
-        lsof_check(lambda: self.test_simple_many(tmpfile))
+    def test_simple_many_check_open_files(self, testdir):
+        with lsof_check():
+            with testdir.makepyfile("").open('wb+') as tmpfile:
+                self.test_simple_many(tmpfile)
 
     def test_simple_fail_second_start(self, tmpfile):
         fd = tmpfile.fileno()
@@ -888,12 +895,10 @@
         assert err == "abc"
 
     def test_many(self, capfd):
-        def f():
+        with lsof_check():
             for i in range(10):
                 cap = capture.StdCaptureFD()
                 cap.reset()
-        lsof_check(f)
-
 
 
 @needsosdup


https://bitbucket.org/hpk42/pytest/commits/f3a9bf08c714/
Changeset:   f3a9bf08c714
User:        hpk42
Date:        2014-01-29 11:46:36
Summary:     refine skipif to use direct booleans, to help with flakes
Affected #:  2 files

diff -r 375d0e5f139590c1fb9700c113c0f44f2fd72497 -r f3a9bf08c714cb0b7fbbf13010d5a5266b86db60 testing/acceptance_test.py
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -177,7 +177,8 @@
         assert result.ret != 0
         assert "should be seen" in result.stdout.str()
 
-    @pytest.mark.skipif("not hasattr(py.path.local, 'mksymlinkto')")
+    @pytest.mark.skipif(not hasattr(py.path.local, 'mksymlinkto'),
+                        reason="symlink not available on this platform")
     def test_chdir(self, testdir):
         testdir.tmpdir.join("py").mksymlinkto(py._pydir)
         p = testdir.tmpdir.join("main.py")

diff -r 375d0e5f139590c1fb9700c113c0f44f2fd72497 -r f3a9bf08c714cb0b7fbbf13010d5a5266b86db60 testing/test_tmpdir.py
--- a/testing/test_tmpdir.py
+++ b/testing/test_tmpdir.py
@@ -1,3 +1,4 @@
+import py
 import pytest
 
 from _pytest.tmpdir import tmpdir, TempdirHandler
@@ -71,7 +72,8 @@
     assert result.ret == 0
     assert mytemp.join('hello').check()
 
- at pytest.mark.skipif("not hasattr(py.path.local, 'mksymlinkto')")
+ at pytest.mark.skipif(not hasattr(py.path.local, 'mksymlinkto'),
+                    reason="symlink not available on this platform")
 def test_tmpdir_always_is_realpath(testdir):
     # the reason why tmpdir should be a realpath is that
     # when you cd to it and do "os.getcwd()" you will anyway


https://bitbucket.org/hpk42/pytest/commits/fbc05fb4bc71/
Changeset:   fbc05fb4bc71
User:        hpk42
Date:        2014-01-29 13:11:40
Summary:     require py>=1.2.20
Affected #:  2 files

diff -r f3a9bf08c714cb0b7fbbf13010d5a5266b86db60 -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 setup.py
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 
 long_description = open("README.rst").read()
 def main():
-    install_requires = ["py>=1.4.20.dev2"]
+    install_requires = ["py>=1.4.20"]
     if sys.version_info < (2,7):
         install_requires.append("argparse")
     if sys.platform == "win32":

diff -r f3a9bf08c714cb0b7fbbf13010d5a5266b86db60 -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 testing/test_assertrewrite.py
--- a/testing/test_assertrewrite.py
+++ b/testing/test_assertrewrite.py
@@ -411,8 +411,8 @@
         testdir.tmpdir.join("test_newlines.py").write(b, "wb")
         assert testdir.runpytest().ret == 0
 
-    @pytest.mark.skipif(sys.version_info[0] == 2,
-                        reason='packages without __init__.py not supported on python 2')
+    @pytest.mark.skipif(sys.version_info < (3,3),
+            reason='packages without __init__.py not supported on python 2')
     def test_package_without__init__py(self, testdir):
         pkg = testdir.mkdir('a_package_without_init_py')
         pkg.join('module.py').ensure()


https://bitbucket.org/hpk42/pytest/commits/1a190672b6cc/
Changeset:   1a190672b6cc
User:        hpk42
Date:        2014-01-29 13:47:11
Summary:     add release announcement, bump version to 2.5.2,
add links to plugins index, regenerate doc examples.
Affected #:  28 files

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-UNRELEASED
+2.5.2
 -----------------------------------
 
 - fix issue409 -- better interoperate with cx_freeze by not

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.5.2.dev1'
+__version__ = '2.5.2'

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/_templates/links.html
--- a/doc/en/_templates/links.html
+++ b/doc/en/_templates/links.html
@@ -4,6 +4,7 @@
   <li><a href="{{ pathto('contributing') }}">Contribution Guide</a></li><li><a href="https://pypi.python.org/pypi/pytest">pytest @ PyPI</a></li><li><a href="https://bitbucket.org/hpk42/pytest/">pytest @ Bitbucket</a></li>
+  <li><a href="http://pytest.org/latest/plugins_index/index.html">3rd party plugins (beta)</a></li><li><a href="https://bitbucket.org/hpk42/pytest/issues?status=new&status=open">Issue Tracker</a></li><li><a href="http://pytest.org/latest/pytest.pdf">PDF Documentation</a></ul>

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/announce/index.txt
--- a/doc/en/announce/index.txt
+++ b/doc/en/announce/index.txt
@@ -5,6 +5,7 @@
 .. toctree::
    :maxdepth: 2
 
+   release-2.5.2
    release-2.5.1
    release-2.5.0
    release-2.4.2

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/announce/release-2.5.2.txt
--- /dev/null
+++ b/doc/en/announce/release-2.5.2.txt
@@ -0,0 +1,64 @@
+pytest-2.5.2: fixes 
+===========================================================================
+
+pytest is a mature Python testing tool with more than a 1000 tests 
+against itself, passing on many different interpreters and platforms.  
+
+The 2.5.2 release fixes a few bugs with two maybe-bugs remaining and
+actively being worked on (and waiting for the bug reporter's input).
+We also have a new contribution guide thanks to Piotr Banaszkiewicz
+and others.
+
+See docs at:
+
+    http://pytest.org
+
+As usual, you can upgrade from pypi via::
+
+    pip install -U pytest
+
+Thanks to the following people who contributed to this release:
+
+    Anatoly Bubenkov 
+    Ronny Pfannschmidt
+    Floris Bruynooghe
+    Bruno Oliveira 
+    Andreas Pelme 
+    Jurko Gospodnetić
+    Piotr Banaszkiewicz 
+    Simon Liedtke 
+    lakka 
+    Lukasz Balcerzak 
+    Philippe Muller 
+    Daniel Hahler 
+
+have fun,
+holger krekel
+
+2.5.2
+-----------------------------------
+
+- fix issue409 -- better interoperate with cx_freeze by not
+  trying to import from collections.abc which causes problems 
+  for py27/cx_freeze.  Thanks Wolfgang L. for reporting and tracking it down.
+
+- fixed docs and code to use "pytest" instead of "py.test" almost everywhere.
+  Thanks Jurko Gospodnetic for the complete PR.  
+
+- fix issue425: mention at end of "py.test -h" that --markers
+  and --fixtures work according to specified test path (or current dir)
+
+- fix issue413: exceptions with unicode attributes are now printed
+  correctly also on python2 and with pytest-xdist runs. (the fix
+  requires py-1.4.20)
+
+- copy, cleanup and integrate py.io capture
+  from pylib 1.4.20.dev2 (rev 13d9af95547e)
+  
+- address issue416: clarify docs as to conftest.py loading semantics
+
+- fix issue429: comparing byte strings with non-ascii chars in assert
+  expressions now work better.  Thanks Floris Bruynooghe.
+
+- make capfd/capsys.capture private, its unused and shouldnt be exposed
+

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/assert.txt
--- a/doc/en/assert.txt
+++ b/doc/en/assert.txt
@@ -26,19 +26,19 @@
 
     $ py.test test_assert1.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_assert1.py F
-
+    
     ================================= FAILURES =================================
     ______________________________ test_function _______________________________
-
+    
         def test_function():
     >       assert f() == 4
     E       assert 3 == 4
     E        +  where 3 = f()
-
+    
     test_assert1.py:5: AssertionError
     ========================= 1 failed in 0.01 seconds =========================
 
@@ -116,14 +116,14 @@
 
     $ py.test test_assert2.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_assert2.py F
-
+    
     ================================= FAILURES =================================
     ___________________________ test_set_comparison ____________________________
-
+    
         def test_set_comparison():
             set1 = set("1308")
             set2 = set("8035")
@@ -133,7 +133,7 @@
     E         '1'
     E         Extra items in the right set:
     E         '5'
-
+    
     test_assert2.py:5: AssertionError
     ========================= 1 failed in 0.01 seconds =========================
 

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/capture.txt
--- a/doc/en/capture.txt
+++ b/doc/en/capture.txt
@@ -64,21 +64,21 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py .F
-
+    
     ================================= FAILURES =================================
     ________________________________ test_func2 ________________________________
-
+    
         def test_func2():
     >       assert False
     E       assert False
-
+    
     test_module.py:9: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    setting up <function test_func2 at 0x1eb37d0>
+    setting up <function test_func2 at 0x1ec25f0>
     ==================== 1 failed, 1 passed in 0.01 seconds ====================
 
 Accessing captured output from a test function

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/conf.py
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,8 +17,8 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = "2.5.1"
-release = "2.5.1"
+version = "2.5.2"
+release = "2.5.2"
 
 import sys, os
 

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/contents.txt
--- a/doc/en/contents.txt
+++ b/doc/en/contents.txt
@@ -14,6 +14,7 @@
    overview
    apiref
    plugins
+   plugins_index/index
    example/index
    talks
    contributing

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/doctest.txt
--- a/doc/en/doctest.txt
+++ b/doc/en/doctest.txt
@@ -44,7 +44,7 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
     
     mymodule.py .

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/markers.txt
--- a/doc/en/example/markers.txt
+++ b/doc/en/example/markers.txt
@@ -28,11 +28,11 @@
 
     $ py.test -v -m webtest
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
-
+    
     test_server.py:3: test_send_http PASSED
-
+    
     =================== 2 tests deselected by "-m 'webtest'" ===================
     ================== 1 passed, 2 deselected in 0.01 seconds ==================
 
@@ -40,12 +40,12 @@
 
     $ py.test -v -m "not webtest"
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
-
+    
     test_server.py:6: test_something_quick PASSED
     test_server.py:8: test_another PASSED
-
+    
     ================= 1 tests deselected by "-m 'not webtest'" =================
     ================== 2 passed, 1 deselected in 0.01 seconds ==================
 
@@ -61,11 +61,11 @@
 
     $ py.test -v -k http  # running with the above defined example module
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
-
+    
     test_server.py:3: test_send_http PASSED
-
+    
     ====================== 2 tests deselected by '-khttp' ======================
     ================== 1 passed, 2 deselected in 0.01 seconds ==================
 
@@ -73,12 +73,12 @@
 
     $ py.test -k "not send_http" -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
-
+    
     test_server.py:6: test_something_quick PASSED
     test_server.py:8: test_another PASSED
-
+    
     ================= 1 tests deselected by '-knot send_http' ==================
     ================== 2 passed, 1 deselected in 0.01 seconds ==================
 
@@ -86,12 +86,12 @@
 
     $ py.test -k "http or quick" -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 3 items
-
+    
     test_server.py:3: test_send_http PASSED
     test_server.py:6: test_something_quick PASSED
-
+    
     ================= 1 tests deselected by '-khttp or quick' ==================
     ================== 2 passed, 1 deselected in 0.01 seconds ==================
 
@@ -124,19 +124,19 @@
 
     $ py.test --markers
     @pytest.mark.webtest: mark a test as a webtest.
-
+    
     @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see http://pytest.org/latest/skipping.html
-
+    
     @pytest.mark.xfail(condition, reason=None, run=True): mark the the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. See http://pytest.org/latest/skipping.html
-
+    
     @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see http://pytest.org/latest/parametrize.html for more info and examples.
-
-    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures
-
+    
+    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures 
+    
     @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
-
+    
     @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible.
-
+    
 
 For an example on how to add and work with markers from a plugin, see
 :ref:`adding a custom marker from a plugin`.
@@ -266,41 +266,41 @@
 
     $ py.test -E stage2
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_someenv.py s
-
+    
     ======================== 1 skipped in 0.01 seconds =========================
 
 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.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_someenv.py .
-
+    
     ========================= 1 passed in 0.01 seconds =========================
 
 The ``--markers`` option always gives you a list of available markers::
 
     $ py.test --markers
     @pytest.mark.env(name): mark test to run only on named environment
-
+    
     @pytest.mark.skipif(condition): skip the given test function if eval(condition) results in a True value.  Evaluation happens within the module global context. Example: skipif('sys.platform == "win32"') skips the test if we are on the win32 platform. see http://pytest.org/latest/skipping.html
-
+    
     @pytest.mark.xfail(condition, reason=None, run=True): mark the the test function as an expected failure if eval(condition) has a True value. Optionally specify a reason for better reporting and run=False if you don't even want to execute the test function. See http://pytest.org/latest/skipping.html
-
+    
     @pytest.mark.parametrize(argnames, argvalues): call a test function multiple times passing in different arguments in turn. argvalues generally needs to be a list of values if argnames specifies only one name or a list of tuples of values if argnames specifies multiple names. Example: @parametrize('arg1', [1,2]) would lead to two calls of the decorated test function, one with arg1=1 and another with arg1=2.see http://pytest.org/latest/parametrize.html for more info and examples.
-
-    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures
-
+    
+    @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures 
+    
     @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
-
+    
     @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible.
-
+    
 
 Reading markers which were set from multiple places
 ----------------------------------------------------
@@ -395,24 +395,24 @@
 
     $ py.test -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 4 items
-
+    
     test_plat.py s.s.
     ========================= short test summary info ==========================
-    SKIP [2] /tmp/doc-exec-63/conftest.py:12: cannot run on platform linux2
-
+    SKIP [2] /tmp/doc-exec-65/conftest.py:12: cannot run on platform linux2
+    
     =================== 2 passed, 2 skipped in 0.01 seconds ====================
 
 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.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 4 items
-
+    
     test_plat.py .
-
+    
     =================== 3 tests deselected by "-m 'linux2'" ====================
     ================== 1 passed, 3 deselected in 0.01 seconds ==================
 
@@ -459,11 +459,11 @@
 
   $ py.test -m interface --tb=short
   =========================== test session starts ============================
-  platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+  platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
   collected 4 items
-
+  
   test_module.py FF
-
+  
   ================================= FAILURES =================================
   __________________________ test_interface_simple ___________________________
   test_module.py:3: in test_interface_simple
@@ -480,11 +480,11 @@
 
   $ py.test -m "interface or event" --tb=short
   =========================== test session starts ============================
-  platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+  platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
   collected 4 items
-
+  
   test_module.py FFF
-
+  
   ================================= FAILURES =================================
   __________________________ test_interface_simple ___________________________
   test_module.py:3: in test_interface_simple

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/nonpython.txt
--- a/doc/en/example/nonpython.txt
+++ b/doc/en/example/nonpython.txt
@@ -27,10 +27,10 @@
 
     nonpython $ py.test test_simple.yml
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
     
-    test_simple.yml .F
+    test_simple.yml F.
     
     ================================= FAILURES =================================
     ______________________________ usecase: hello ______________________________
@@ -56,11 +56,11 @@
 
     nonpython $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 2 items
     
+    test_simple.yml:1: usecase: hello FAILED
     test_simple.yml:1: usecase: ok PASSED
-    test_simple.yml:1: usecase: hello FAILED
     
     ================================= FAILURES =================================
     ______________________________ usecase: hello ______________________________
@@ -74,10 +74,10 @@
 
     nonpython $ py.test --collect-only
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
     <YamlFile 'test_simple.yml'>
+      <YamlItem 'hello'><YamlItem 'ok'>
-      <YamlItem 'hello'>
     
     =============================  in 0.02 seconds =============================

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/parametrize.txt
--- a/doc/en/example/parametrize.txt
+++ b/doc/en/example/parametrize.txt
@@ -106,11 +106,11 @@
 
     $ py.test test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 4 items
-
+    
     test_scenarios.py ....
-
+    
     ========================= 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::
@@ -118,7 +118,7 @@
 
     $ py.test --collect-only test_scenarios.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 4 items
     <Module 'test_scenarios.py'><Class 'TestSampleWithScenarios'>
@@ -127,7 +127,7 @@
           <Function 'test_demo2[basic]'><Function 'test_demo1[advanced]'><Function 'test_demo2[advanced]'>
-
+    
     =============================  in 0.01 seconds =============================
 
 Note that we told ``metafunc.parametrize()`` that your scenario values
@@ -182,12 +182,12 @@
 
     $ py.test test_backends.py --collect-only
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
     <Module 'test_backends.py'><Function 'test_db_initialized[d1]'><Function 'test_db_initialized[d2]'>
-
+    
     =============================  in 0.00 seconds =============================
 
 And then when we run the test::
@@ -196,15 +196,15 @@
     .F
     ================================= FAILURES =================================
     _________________________ test_db_initialized[d2] __________________________
-
-    db = <conftest.DB2 instance at 0x12d4128>
-
+    
+    db = <conftest.DB2 instance at 0x1e5f050>
+    
         def test_db_initialized(db):
             # a dummy test
             if db.__class__.__name__ == "DB2":
     >           pytest.fail("deliberately failing for demo purposes")
     E           Failed: deliberately failing for demo purposes
-
+    
     test_backends.py:6: Failed
     1 failed, 1 passed in 0.01 seconds
 
@@ -251,14 +251,14 @@
     $ py.test -q
     F..
     ================================= FAILURES =================================
-    ________________________ TestClass.test_equals[2-1] ________________________
-
-    self = <test_parametrize.TestClass instance at 0x14493f8>, a = 1, b = 2
-
+    ________________________ TestClass.test_equals[1-2] ________________________
+    
+    self = <test_parametrize.TestClass instance at 0x246c4d0>, a = 1, b = 2
+    
         def test_equals(self, a, b):
     >       assert a == b
     E       assert 1 == 2
-
+    
     test_parametrize.py:18: AssertionError
     1 failed, 2 passed in 0.01 seconds
 
@@ -281,8 +281,8 @@
    . $ py.test -rs -q multipython.py
    ............sss............sss............sss............ssssssssssssssssss
    ========================= short test summary info ==========================
-   SKIP [27] /home/hpk/p/pytest/doc/en/example/multipython.py:21: 'python2.8' not found
-   48 passed, 27 skipped in 1.34 seconds
+   SKIP [27] /home/hpk/p/pytest/doc/en/example/multipython.py:22: 'python2.8' not found
+   48 passed, 27 skipped in 1.30 seconds
 
 Indirect parametrization of optional implementations/imports
 --------------------------------------------------------------------
@@ -329,13 +329,13 @@
 
     $ py.test -rs test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-65/conftest.py:10: could not import 'opt2'
-
+    SKIP [1] /tmp/doc-exec-67/conftest.py:10: could not import 'opt2'
+    
     =================== 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

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/pythoncollection.txt
--- a/doc/en/example/pythoncollection.txt
+++ b/doc/en/example/pythoncollection.txt
@@ -43,14 +43,14 @@
 
     $ py.test --collect-only
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
     <Module 'check_myapp.py'><Class 'CheckMyApp'><Instance '()'><Function 'check_simple'><Function 'check_complex'>
-
+    
     =============================  in 0.01 seconds =============================
 
 .. note::
@@ -88,7 +88,7 @@
 
     . $ py.test --collect-only pythoncollection.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 3 items
     <Module 'pythoncollection.py'><Function 'test_function'>
@@ -96,7 +96,7 @@
         <Instance '()'><Function 'test_method'><Function 'test_anothermethod'>
-
+    
     =============================  in 0.01 seconds =============================
 
 customizing test collection to find all .py files
@@ -141,11 +141,11 @@
 
     $ py.test --collect-only
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
     <Module 'pkg/module_py2.py'><Function 'test_only_on_python2'>
-
+    
     =============================  in 0.01 seconds =============================
 
 If you run with a Python3 interpreter the moduled added through the conftest.py file will not be considered for test collection.

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/reportingdemo.txt
--- a/doc/en/example/reportingdemo.txt
+++ b/doc/en/example/reportingdemo.txt
@@ -13,84 +13,84 @@
 
     assertion $ py.test failure_demo.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 39 items
-
+    
     failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-
+    
     ================================= FAILURES =================================
     ____________________________ test_generative[0] ____________________________
-
+    
     param1 = 3, param2 = 6
-
+    
         def test_generative(param1, param2):
     >       assert param1 * 2 < param2
     E       assert (3 * 2) < 6
-
+    
     failure_demo.py:15: AssertionError
     _________________________ TestFailing.test_simple __________________________
-
-    self = <failure_demo.TestFailing object at 0x12d9250>
-
+    
+    self = <failure_demo.TestFailing object at 0x29e5210>
+    
         def test_simple(self):
             def f():
                 return 42
             def g():
                 return 43
-
+        
     >       assert f() == g()
     E       assert 42 == 43
-    E        +  where 42 = <function f at 0x1278b90>()
-    E        +  and   43 = <function g at 0x1278c08>()
-
+    E        +  where 42 = <function f at 0x296a9b0>()
+    E        +  and   43 = <function g at 0x296aa28>()
+    
     failure_demo.py:28: AssertionError
     ____________________ TestFailing.test_simple_multiline _____________________
-
-    self = <failure_demo.TestFailing object at 0x1287210>
-
+    
+    self = <failure_demo.TestFailing object at 0x29cef50>
+    
         def test_simple_multiline(self):
             otherfunc_multi(
                       42,
     >                 6*9)
-
-    failure_demo.py:33:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
+    
+    failure_demo.py:33: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
     a = 42, b = 54
-
+    
         def otherfunc_multi(a,b):
     >       assert (a ==
                     b)
     E       assert 42 == 54
-
+    
     failure_demo.py:11: AssertionError
     ___________________________ TestFailing.test_not ___________________________
-
-    self = <failure_demo.TestFailing object at 0x12c6e10>
-
+    
+    self = <failure_demo.TestFailing object at 0x29be250>
+    
         def test_not(self):
             def f():
                 return 42
     >       assert not f()
     E       assert not 42
-    E        +  where 42 = <function f at 0x12861b8>()
-
+    E        +  where 42 = <function f at 0x296ac08>()
+    
     failure_demo.py:38: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_text _________________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1290c50>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29c3990>
+    
         def test_eq_text(self):
     >       assert 'spam' == 'eggs'
     E       assert 'spam' == 'eggs'
     E         - spam
     E         + eggs
-
+    
     failure_demo.py:42: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_similar_text _____________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12877d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x2acef90>
+    
         def test_eq_similar_text(self):
     >       assert 'foo 1 bar' == 'foo 2 bar'
     E       assert 'foo 1 bar' == 'foo 2 bar'
@@ -98,12 +98,12 @@
     E         ?     ^
     E         + foo 2 bar
     E         ?     ^
-
+    
     failure_demo.py:45: AssertionError
     ____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12de1d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29f1f50>
+    
         def test_eq_multiline_text(self):
     >       assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
     E       assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
@@ -111,12 +111,12 @@
     E         - spam
     E         + eggs
     E           bar
-
+    
     failure_demo.py:48: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_long_text _______________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x143b5d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29e58d0>
+    
         def test_eq_long_text(self):
             a = '1'*100 + 'a' + '2'*100
             b = '1'*100 + 'b' + '2'*100
@@ -128,12 +128,12 @@
     E         ?           ^
     E         + 1111111111b222222222
     E         ?           ^
-
+    
     failure_demo.py:53: AssertionError
     _________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x1287810>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29cee50>
+    
         def test_eq_long_text_multiline(self):
             a = '1\n'*100 + 'a' + '2\n'*100
             b = '1\n'*100 + 'b' + '2\n'*100
@@ -152,34 +152,34 @@
     E           2
     E           2
     E           2
-
+    
     failure_demo.py:58: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12900d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29c3810>
+    
         def test_eq_list(self):
     >       assert [0, 1, 2] == [0, 1, 3]
     E       assert [0, 1, 2] == [0, 1, 3]
     E         At index 2 diff: 2 != 3
-
+    
     failure_demo.py:61: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12c62d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29e50d0>
+    
         def test_eq_list_long(self):
             a = [0]*100 + [1] + [3]*100
             b = [0]*100 + [2] + [3]*100
     >       assert a == b
     E       assert [0, 0, 0, 0, 0, 0, ...] == [0, 0, 0, 0, 0, 0, ...]
     E         At index 100 diff: 1 != 2
-
+    
     failure_demo.py:66: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12deb50>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29c5dd0>
+    
         def test_eq_dict(self):
     >       assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
     E       assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
@@ -190,12 +190,12 @@
     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 0x128b4d0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29e2690>
+    
         def test_eq_set(self):
     >       assert set([0, 10, 11, 12]) == set([0, 20, 21])
     E       assert set([0, 10, 11, 12]) == set([0, 20, 21])
@@ -206,31 +206,31 @@
     E         Extra items in the right set:
     E         20
     E         21
-
+    
     failure_demo.py:72: AssertionError
     _____________ TestSpecialisedExplanations.test_eq_longer_list ______________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12c6b10>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29ceb50>
+    
         def test_eq_longer_list(self):
     >       assert [1,2] == [1,2,3]
     E       assert [1, 2] == [1, 2, 3]
     E         Right contains more items, first extra item: 3
-
+    
     failure_demo.py:75: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x143b650>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29c3050>
+    
         def test_in_list(self):
     >       assert 1 in [0, 2, 3, 4, 5]
     E       assert 1 in [0, 2, 3, 4, 5]
-
+    
     failure_demo.py:78: AssertionError
     __________ TestSpecialisedExplanations.test_not_in_text_multiline __________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x128be10>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29e5b10>
+    
         def test_not_in_text_multiline(self):
             text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail'
     >       assert 'foo' not in text
@@ -243,12 +243,12 @@
     E         ?          +++
     E           and a
     E           tail
-
+    
     failure_demo.py:82: AssertionError
     ___________ TestSpecialisedExplanations.test_not_in_text_single ____________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12d9fd0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29f1610>
+    
         def test_not_in_text_single(self):
             text = 'single foo line'
     >       assert 'foo' not in text
@@ -256,58 +256,58 @@
     E         'foo' is contained here:
     E           single foo line
     E         ?        +++
-
+    
     failure_demo.py:86: AssertionError
     _________ TestSpecialisedExplanations.test_not_in_text_single_long _________
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x143bdd0>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29cea50>
+    
         def test_not_in_text_single_long(self):
             text = 'head ' * 50 + 'foo ' + 'tail ' * 20
     >       assert 'foo' not in text
     E       assert 'foo' not in 'head head head head hea...ail tail tail tail tail '
     E         'foo' is contained here:
-    E           head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
+    E           head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail 
     E         ?           +++
-
+    
     failure_demo.py:90: AssertionError
     ______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
-
-    self = <failure_demo.TestSpecialisedExplanations object at 0x12c6390>
-
+    
+    self = <failure_demo.TestSpecialisedExplanations object at 0x29e2a10>
+    
         def test_not_in_text_single_long_term(self):
             text = 'head ' * 50 + 'f'*70 + 'tail ' * 20
     >       assert 'f'*70 not in text
     E       assert 'fffffffffff...ffffffffffff' not in 'head head he...l tail tail '
     E         'ffffffffffffffffff...fffffffffffffffffff' is contained here:
-    E           head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
+    E           head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail 
     E         ?           ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
+    
     failure_demo.py:94: AssertionError
     ______________________________ test_attribute ______________________________
-
+    
         def test_attribute():
             class Foo(object):
                 b = 1
             i = Foo()
     >       assert i.b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x1287790>.b
-
+    E        +  where 1 = <failure_demo.Foo object at 0x29c77d0>.b
+    
     failure_demo.py:101: AssertionError
     _________________________ test_attribute_instance __________________________
-
+    
         def test_attribute_instance():
             class Foo(object):
                 b = 1
     >       assert Foo().b == 2
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x12c6bd0>.b
-    E        +    where <failure_demo.Foo object at 0x12c6bd0> = <class 'failure_demo.Foo'>()
-
+    E        +  where 1 = <failure_demo.Foo object at 0x29e5f10>.b
+    E        +    where <failure_demo.Foo object at 0x29e5f10> = <class 'failure_demo.Foo'>()
+    
     failure_demo.py:107: AssertionError
     __________________________ test_attribute_failure __________________________
-
+    
         def test_attribute_failure():
             class Foo(object):
                 def _get_b(self):
@@ -315,19 +315,19 @@
                 b = property(_get_b)
             i = Foo()
     >       assert i.b == 2
-
-    failure_demo.py:116:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
-    self = <failure_demo.Foo object at 0x12daed0>
-
+    
+    failure_demo.py:116: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
+    self = <failure_demo.Foo object at 0x29e6b10>
+    
         def _get_b(self):
     >       raise Exception('Failed to get attrib')
     E       Exception: Failed to get attrib
-
+    
     failure_demo.py:113: Exception
     _________________________ test_attribute_multiple __________________________
-
+    
         def test_attribute_multiple():
             class Foo(object):
                 b = 1
@@ -335,78 +335,78 @@
                 b = 2
     >       assert Foo().b == Bar().b
     E       assert 1 == 2
-    E        +  where 1 = <failure_demo.Foo object at 0x128bcd0>.b
-    E        +    where <failure_demo.Foo object at 0x128bcd0> = <class 'failure_demo.Foo'>()
-    E        +  and   2 = <failure_demo.Bar object at 0x128b050>.b
-    E        +    where <failure_demo.Bar object at 0x128b050> = <class 'failure_demo.Bar'>()
-
+    E        +  where 1 = <failure_demo.Foo object at 0x29c3b10>.b
+    E        +    where <failure_demo.Foo object at 0x29c3b10> = <class 'failure_demo.Foo'>()
+    E        +  and   2 = <failure_demo.Bar object at 0x29c3350>.b
+    E        +    where <failure_demo.Bar object at 0x29c3350> = <class 'failure_demo.Bar'>()
+    
     failure_demo.py:124: AssertionError
     __________________________ TestRaises.test_raises __________________________
-
-    self = <failure_demo.TestRaises instance at 0x145c7e8>
-
+    
+    self = <failure_demo.TestRaises instance at 0x2aec878>
+    
         def test_raises(self):
             s = 'qwe'
     >       raises(TypeError, "int(s)")
-
-    failure_demo.py:133:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
+    
+    failure_demo.py:133: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
     >   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:983>:1: ValueError
+    
+    <0-codegen /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:999>:1: ValueError
     ______________________ TestRaises.test_raises_doesnt _______________________
-
-    self = <failure_demo.TestRaises instance at 0x1455f38>
-
+    
+    self = <failure_demo.TestRaises instance at 0x2aafef0>
+    
         def test_raises_doesnt(self):
     >       raises(IOError, "int('3')")
     E       Failed: DID NOT RAISE
-
+    
     failure_demo.py:136: Failed
     __________________________ TestRaises.test_raise ___________________________
-
-    self = <failure_demo.TestRaises instance at 0x1453998>
-
+    
+    self = <failure_demo.TestRaises instance at 0x2ae5758>
+    
         def test_raise(self):
     >       raise ValueError("demo error")
     E       ValueError: demo error
-
+    
     failure_demo.py:139: ValueError
     ________________________ TestRaises.test_tupleerror ________________________
-
-    self = <failure_demo.TestRaises instance at 0x1465560>
-
+    
+    self = <failure_demo.TestRaises instance at 0x29cf4d0>
+    
         def test_tupleerror(self):
     >       a,b = [1]
     E       ValueError: need more than 1 value to unpack
-
+    
     failure_demo.py:142: ValueError
     ______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
-
-    self = <failure_demo.TestRaises instance at 0x1465758>
-
+    
+    self = <failure_demo.TestRaises instance at 0x29cf9e0>
+    
         def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
             l = [1,2,3]
             print ("l is %r" % l)
     >       a,b = l.pop()
     E       TypeError: 'int' object is not iterable
-
+    
     failure_demo.py:147: TypeError
     ----------------------------- Captured stdout ------------------------------
     l is [1, 2, 3]
     ________________________ TestRaises.test_some_error ________________________
-
-    self = <failure_demo.TestRaises instance at 0x1468ab8>
-
+    
+    self = <failure_demo.TestRaises instance at 0x29d9ea8>
+    
         def test_some_error(self):
     >       if namenotexi:
     E       NameError: global name 'namenotexi' is not defined
-
+    
     failure_demo.py:150: NameError
     ____________________ test_dynamic_compile_shows_nicely _____________________
-
+    
         def test_dynamic_compile_shows_nicely():
             src = 'def foo():\n assert 1 == 0\n'
             name = 'abc-123'
@@ -415,132 +415,132 @@
             py.builtin.exec_(code, module.__dict__)
             py.std.sys.modules[name] = module
     >       module.foo()
-
-    failure_demo.py:165:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
+    
+    failure_demo.py:165: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
         def foo():
     >    assert 1 == 0
     E    assert 1 == 0
-
+    
     <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 0x1442908>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x29ca8c0>
+    
         def test_complex_error(self):
             def f():
                 return 44
             def g():
                 return 43
     >       somefunc(f(), g())
-
-    failure_demo.py:175:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
+    
+    failure_demo.py:175: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
     x = 44, y = 43
-
+    
         def somefunc(x,y):
     >       otherfunc(x,y)
-
-    failure_demo.py:8:
-    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
+    
+    failure_demo.py:8: 
+    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
+    
     a = 44, b = 43
-
+    
         def otherfunc(a,b):
     >       assert a==b
     E       assert 44 == 43
-
+    
     failure_demo.py:5: AssertionError
     ___________________ TestMoreErrors.test_z1_unpack_error ____________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x145bab8>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x2ae2ea8>
+    
         def test_z1_unpack_error(self):
             l = []
     >       a,b  = l
     E       ValueError: need more than 0 values to unpack
-
+    
     failure_demo.py:179: ValueError
     ____________________ TestMoreErrors.test_z2_type_error _____________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x1444368>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x29da518>
+    
         def test_z2_type_error(self):
             l = 3
     >       a,b  = l
     E       TypeError: 'int' object is not iterable
-
+    
     failure_demo.py:183: TypeError
     ______________________ TestMoreErrors.test_startswith ______________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x146e4d0>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x29b8440>
+    
         def test_startswith(self):
             s = "123"
             g = "456"
     >       assert s.startswith(g)
-    E       assert <built-in method startswith of str object at 0x12dfa58>('456')
-    E        +  where <built-in method startswith of str object at 0x12dfa58> = '123'.startswith
-
+    E       assert <built-in method startswith of str object at 0x29ea328>('456')
+    E        +  where <built-in method startswith of str object at 0x29ea328> = '123'.startswith
+    
     failure_demo.py:188: AssertionError
     __________________ TestMoreErrors.test_startswith_nested ___________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x143ed40>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x2ae4e18>
+    
         def test_startswith_nested(self):
             def f():
                 return "123"
             def g():
                 return "456"
     >       assert f().startswith(g())
-    E       assert <built-in method startswith of str object at 0x12dfa58>('456')
-    E        +  where <built-in method startswith of str object at 0x12dfa58> = '123'.startswith
-    E        +    where '123' = <function f at 0x1286500>()
-    E        +  and   '456' = <function g at 0x126db18>()
-
+    E       assert <built-in method startswith of str object at 0x29ea328>('456')
+    E        +  where <built-in method startswith of str object at 0x29ea328> = '123'.startswith
+    E        +    where '123' = <function f at 0x29595f0>()
+    E        +  and   '456' = <function g at 0x2ab5320>()
+    
     failure_demo.py:195: AssertionError
     _____________________ TestMoreErrors.test_global_func ______________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x1453b90>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x2abf320>
+    
         def test_global_func(self):
     >       assert isinstance(globf(42), float)
     E       assert isinstance(43, float)
     E        +  where 43 = globf(42)
-
+    
     failure_demo.py:198: AssertionError
     _______________________ TestMoreErrors.test_instance _______________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x146b128>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x2aaf050>
+    
         def test_instance(self):
             self.x = 6*7
     >       assert self.x != 42
     E       assert 42 != 42
-    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x146b128>.x
-
+    E        +  where 42 = <failure_demo.TestMoreErrors instance at 0x2aaf050>.x
+    
     failure_demo.py:202: AssertionError
     _______________________ TestMoreErrors.test_compare ________________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x1469368>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x2aedbd8>
+    
         def test_compare(self):
     >       assert globf(10) < 5
     E       assert 11 < 5
     E        +  where 11 = globf(10)
-
+    
     failure_demo.py:205: AssertionError
     _____________________ TestMoreErrors.test_try_finally ______________________
-
-    self = <failure_demo.TestMoreErrors instance at 0x12c4098>
-
+    
+    self = <failure_demo.TestMoreErrors instance at 0x29f2098>
+    
         def test_try_finally(self):
             x = 1
             try:
     >           assert x == 0
     E           assert 1 == 0
-
+    
     failure_demo.py:210: AssertionError
     ======================== 39 failed in 0.20 seconds =========================

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/example/simple.txt
--- a/doc/en/example/simple.txt
+++ b/doc/en/example/simple.txt
@@ -108,9 +108,9 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 0 items
-
+    
     =============================  in 0.00 seconds =============================
 
 .. _`excontrolskip`:
@@ -152,24 +152,24 @@
 
     $ py.test -rs    # "-rs" means report details on the little 's'
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py .s
     ========================= short test summary info ==========================
-    SKIP [1] /tmp/doc-exec-68/conftest.py:9: need --runslow option to run
-
+    SKIP [1] /tmp/doc-exec-70/conftest.py:9: need --runslow option to run
+    
     =================== 1 passed, 1 skipped in 0.01 seconds ====================
 
 Or run it including the ``slow`` marked test::
 
     $ py.test --runslow
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py ..
-
+    
     ========================= 2 passed in 0.01 seconds =========================
 
 Writing well integrated assertion helpers
@@ -256,10 +256,10 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     project deps: mylib-1.1
     collected 0 items
-
+    
     =============================  in 0.00 seconds =============================
 
 .. regendoc:wipe
@@ -279,20 +279,20 @@
 
     $ py.test -v
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     info1: did you know that ...
     did you?
     collecting ... collected 0 items
-
+    
     =============================  in 0.00 seconds =============================
 
 and nothing when run plainly::
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 0 items
-
+    
     =============================  in 0.00 seconds =============================
 
 profiling test duration
@@ -322,11 +322,11 @@
 
     $ py.test --durations=3
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 3 items
-
+    
     test_some_are_slow.py ...
-
+    
     ========================= slowest 3 test durations =========================
     0.20s call     test_some_are_slow.py::test_funcslow2
     0.10s call     test_some_are_slow.py::test_funcslow1
@@ -383,20 +383,20 @@
 
     $ py.test -rx
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 4 items
-
+    
     test_step.py .Fx.
-
+    
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
-
-    self = <test_step.TestUserHandling instance at 0x2758c20>
-
+    
+    self = <test_step.TestUserHandling instance at 0x2768dd0>
+    
         def test_modification(self):
     >       assert 0
     E       assert 0
-
+    
     test_step.py:9: AssertionError
     ========================= short test summary info ==========================
     XFAIL test_step.py::TestUserHandling::()::test_deletion
@@ -453,50 +453,50 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 7 items
-
+    
     test_step.py .Fx.
     a/test_db.py F
     a/test_db2.py F
     b/test_error.py E
-
+    
     ================================== ERRORS ==================================
     _______________________ ERROR at setup of test_root ________________________
-    file /tmp/doc-exec-68/b/test_error.py, line 1
+    file /tmp/doc-exec-70/b/test_error.py, line 1
       def test_root(db):  # no db here, will error out
             fixture 'db' not found
-            available fixtures: recwarn, capfd, pytestconfig, capsys, tmpdir, monkeypatch
+            available fixtures: pytestconfig, capfd, monkeypatch, capsys, recwarn, tmpdir
             use 'py.test --fixtures [testpath]' for help on them.
-
-    /tmp/doc-exec-68/b/test_error.py:1
+    
+    /tmp/doc-exec-70/b/test_error.py:1
     ================================= FAILURES =================================
     ____________________ TestUserHandling.test_modification ____________________
-
-    self = <test_step.TestUserHandling instance at 0x131fc20>
-
+    
+    self = <test_step.TestUserHandling instance at 0x238fdd0>
+    
         def test_modification(self):
     >       assert 0
     E       assert 0
-
+    
     test_step.py:9: AssertionError
     _________________________________ test_a1 __________________________________
-
-    db = <conftest.DB instance at 0x1328878>
-
+    
+    db = <conftest.DB instance at 0x23f9998>
+    
         def test_a1(db):
     >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB instance at 0x1328878>
-
+    E       AssertionError: <conftest.DB instance at 0x23f9998>
+    
     a/test_db.py:2: AssertionError
     _________________________________ test_a2 __________________________________
-
-    db = <conftest.DB instance at 0x1328878>
-
+    
+    db = <conftest.DB instance at 0x23f9998>
+    
         def test_a2(db):
     >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB instance at 0x1328878>
-
+    E       AssertionError: <conftest.DB instance at 0x23f9998>
+    
     a/test_db2.py:2: AssertionError
     ========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.03 seconds ==========
 
@@ -553,34 +553,34 @@
 
     $ py.test test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py FF
-
+    
     ================================= FAILURES =================================
     ________________________________ test_fail1 ________________________________
-
-    tmpdir = local('/tmp/pytest-42/test_fail10')
-
+    
+    tmpdir = local('/tmp/pytest-1012/test_fail10')
+    
         def test_fail1(tmpdir):
     >       assert 0
     E       assert 0
-
+    
     test_module.py:2: AssertionError
     ________________________________ test_fail2 ________________________________
-
+    
         def test_fail2():
     >       assert 0
     E       assert 0
-
+    
     test_module.py:4: AssertionError
     ========================= 2 failed in 0.01 seconds =========================
 
 you will have a "failures" file which contains the failing test ids::
 
     $ cat failures
-    test_module.py::test_fail1 (/tmp/pytest-42/test_fail10)
+    test_module.py::test_fail1 (/tmp/pytest-1012/test_fail10)
     test_module.py::test_fail2
 
 Making test result information available in fixtures
@@ -643,38 +643,38 @@
 
     $ py.test -s test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 3 items
-
+    
     test_module.py Esetting up a test failed! test_module.py::test_setup_fails
     Fexecuting test failed test_module.py::test_call_fails
     F
-
+    
     ================================== ERRORS ==================================
     ____________________ ERROR at setup of test_setup_fails ____________________
-
+    
         @pytest.fixture
         def other():
     >       assert 0
     E       assert 0
-
+    
     test_module.py:6: AssertionError
     ================================= FAILURES =================================
     _____________________________ test_call_fails ______________________________
-
+    
     something = None
-
+    
         def test_call_fails(something):
     >       assert 0
     E       assert 0
-
+    
     test_module.py:12: AssertionError
     ________________________________ test_fail2 ________________________________
-
+    
         def test_fail2():
     >       assert 0
     E       assert 0
-
+    
     test_module.py:15: AssertionError
     ==================== 2 failed, 1 error in 0.01 seconds =====================
 

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/fixture.txt
--- a/doc/en/fixture.txt
+++ b/doc/en/fixture.txt
@@ -76,23 +76,23 @@
 
     $ py.test test_smtpsimple.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_smtpsimple.py F
-
+    
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
-
-    smtp = <smtplib.SMTP instance at 0x2ae3469203f8>
-
+    
+    smtp = <smtplib.SMTP instance at 0x15cc0e0>
+    
         def test_ehlo(smtp):
             response, msg = smtp.ehlo()
             assert response == 250
             assert "merlinux" in msg
     >       assert 0 # for demo purposes
     E       assert 0
-
+    
     test_smtpsimple.py:12: AssertionError
     ========================= 1 failed in 0.21 seconds =========================
 
@@ -194,36 +194,36 @@
 
     $ py.test test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 2 items
-
+    
     test_module.py FF
-
+    
     ================================= FAILURES =================================
     ________________________________ test_ehlo _________________________________
-
-    smtp = <smtplib.SMTP instance at 0x1af5440>
-
+    
+    smtp = <smtplib.SMTP instance at 0x237b638>
+    
         def test_ehlo(smtp):
             response = smtp.ehlo()
             assert response[0] == 250
             assert "merlinux" in response[1]
     >       assert 0  # for demo purposes
     E       assert 0
-
+    
     test_module.py:6: AssertionError
     ________________________________ test_noop _________________________________
-
-    smtp = <smtplib.SMTP instance at 0x1af5440>
-
+    
+    smtp = <smtplib.SMTP instance at 0x237b638>
+    
         def test_noop(smtp):
             response = smtp.noop()
             assert response[0] == 250
     >       assert 0  # for demo purposes
     E       assert 0
-
+    
     test_module.py:11: AssertionError
-    ========================= 2 failed in 0.17 seconds =========================
+    ========================= 2 failed in 0.23 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
@@ -270,8 +270,8 @@
 
     $ py.test -s -q --tb=no
     FFteardown smtp
-
-    2 failed in 0.17 seconds
+    
+    2 failed in 0.21 seconds
 
 We see that the ``smtp`` instance is finalized after the two
 tests finished execution.  Note that if we decorated our fixture
@@ -312,7 +312,7 @@
 
     $ py.test -s -q --tb=no
     FF
-    2 failed in 0.21 seconds
+    2 failed in 0.59 seconds
 
 Let's quickly create another test module that actually sets the
 server URL in its module namespace::
@@ -378,53 +378,53 @@
     FFFF
     ================================= FAILURES =================================
     __________________________ test_ehlo[merlinux.eu] __________________________
-
-    smtp = <smtplib.SMTP instance at 0x100ac20>
-
+    
+    smtp = <smtplib.SMTP instance at 0x21f3e60>
+    
         def test_ehlo(smtp):
             response = smtp.ehlo()
             assert response[0] == 250
             assert "merlinux" in response[1]
     >       assert 0  # for demo purposes
     E       assert 0
-
+    
     test_module.py:6: AssertionError
     __________________________ test_noop[merlinux.eu] __________________________
-
-    smtp = <smtplib.SMTP instance at 0x100ac20>
-
+    
+    smtp = <smtplib.SMTP instance at 0x21f3e60>
+    
         def test_noop(smtp):
             response = smtp.noop()
             assert response[0] == 250
     >       assert 0  # for demo purposes
     E       assert 0
-
+    
     test_module.py:11: AssertionError
     ________________________ test_ehlo[mail.python.org] ________________________
-
-    smtp = <smtplib.SMTP instance at 0x105b638>
-
+    
+    smtp = <smtplib.SMTP instance at 0x22047e8>
+    
         def test_ehlo(smtp):
             response = smtp.ehlo()
             assert response[0] == 250
     >       assert "merlinux" in response[1]
     E       assert 'merlinux' in 'mail.python.org\nSIZE 25600000\nETRN\nSTARTTLS\nENHANCEDSTATUSCODES\n8BITMIME\nDSN'
-
+    
     test_module.py:5: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    finalizing <smtplib.SMTP instance at 0x100ac20>
+    finalizing <smtplib.SMTP instance at 0x21f3e60>
     ________________________ test_noop[mail.python.org] ________________________
-
-    smtp = <smtplib.SMTP instance at 0x105b638>
-
+    
+    smtp = <smtplib.SMTP instance at 0x22047e8>
+    
         def test_noop(smtp):
             response = smtp.noop()
             assert response[0] == 250
     >       assert 0  # for demo purposes
     E       assert 0
-
+    
     test_module.py:11: AssertionError
-    4 failed in 6.58 seconds
+    4 failed in 6.06 seconds
 
 We see that our two test functions each ran twice, against the different
 ``smtp`` instances.  Note also, that with the ``mail.python.org``
@@ -464,13 +464,13 @@
 
     $ py.test -v test_appsetup.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /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 6.42 seconds =========================
 
 Due to the parametrization of ``smtp`` the test will run twice with two
 different ``App`` instances and respective smtp servers.  There is no
@@ -528,9 +528,9 @@
 
     $ py.test -v -s test_module.py
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1 -- /home/hpk/p/pytest/.tox/regen/bin/python
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
     collecting ... collected 8 items
-
+    
     test_module.py:15: test_0[1]   test0 1
     PASSED
     test_module.py:15: test_0[2]   test0 2
@@ -549,7 +549,7 @@
     PASSED
     test_module.py:19: test_2[2-mod2]   test2 2 mod2
     PASSED
-
+    
     ========================= 8 passed in 0.01 seconds =========================
 
 You can see that the parametrized module-scoped ``modarg`` resource caused

diff -r fbc05fb4bc715877eda0d733d69f025c7adc0db9 -r 1a190672b6cc3803f43d24bfe9a106df96a47629 doc/en/getting-started.txt
--- a/doc/en/getting-started.txt
+++ b/doc/en/getting-started.txt
@@ -23,7 +23,7 @@
 To check your installation has installed the correct version::
 
     $ py.test --version
-    This is pytest version 2.5.1, imported from /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.pyc
+    This is pytest version 2.5.2, imported from /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.pyc
 
 If you get an error checkout :ref:`installation issues`.
 
@@ -45,19 +45,19 @@
 
     $ py.test
     =========================== test session starts ============================
-    platform linux2 -- Python 2.7.3 -- pytest-2.5.1
+    platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
     collected 1 items
-
+    
     test_sample.py F
-
+    
     ================================= FAILURES =================================
     _______________________________ test_answer ________________________________
-
+    
         def test_answer():
     >       assert func(3) == 5
     E       assert 4 == 5
     E        +  where 4 = func(3)
-
+    
     test_sample.py:5: AssertionError
     ========================= 1 failed in 0.01 seconds =========================
 
@@ -93,7 +93,7 @@
 
     $ py.test -q test_sysexit.py
     .
-    1 passed in 0.00 seconds
+    1 passed in 0.01 seconds
 
 .. todo:: For further ways to assert exceptions see the `raises`
 
@@ -122,14 +122,14 @@
     .F
     ================================= FAILURES =================================
     ____________________________ TestClass.test_two ____________________________
-
-    self = <test_class.TestClass instance at 0x2b57dd0>
-
+    
+    self = <test_class.TestClass instance at 0x255a0e0>
+    
         def test_two(self):
             x = "hello"
     >       assert hasattr(x, 'check')
     E       assert hasattr('hello', 'check')
-
+    
     test_class.py:8: AssertionError
     1 failed, 1 passed in 0.01 seconds
 
@@ -158,18 +158,18 @@
     F
     ================================= FAILURES =================================
     _____________________________ test_needsfiles ______________________________
-
-    tmpdir = local('/tmp/pytest-38/test_needsfiles0')
-
+    
+    tmpdir = local('/tmp/pytest-1008/test_needsfiles0')
+    
         def test_needsfiles(tmpdir):
             print tmpdir
     >       assert 0
     E       assert 0
-
+    
     test_tmpdir.py:3: AssertionError
     ----------------------------- Captured stdout ------------------------------
-    /tmp/pytest-38/test_needsfiles0
-    1 failed in 0.04 seconds
+    /tmp/pytest-1008/test_needsfiles0
+    1 failed in 0.01 seconds
 
 Before the test runs, a unique-per-test-invocation temporary directory
 was created.  More info at :ref:`tmpdir handling`.

This diff is so big that we needed to truncate the remainder.

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


More information about the pytest-commit mailing list