bump verrsion to python2.7, fix a too precise test for windows, regen docs

2015-03-26 09:34:10 +01:00
parent c69978fbb0
commit d2a8866bce
25 changed files with 385 additions and 583 deletions
--- a/testing/python/fixture.py
+++ b/testing/python/fixture.py
@@ -2450,8 +2450,8 @@ class TestShowFixtures:
                """
        ''')
        result = testdir.runpytest("--fixtures", p)
-        mark = dedent("""
-            ------------- fixtures defined from test_show_fixtures_trimmed_doc -------------
+        result.stdout.fnmatch_lines("""
+            * fixtures defined from test_show_fixtures_trimmed_doc *
            arg2
                line1
                line2
@@ -2459,8 +2459,7 @@ class TestShowFixtures:
                line1
                line2

-            """)
-        assert mark in result.stdout.str()
+        """)


 class TestContextManagerFixtureFuncs: