Merged in RonnyPfannschmidt/pytest/regendoc-upgrade (pull request #303)

use regendoc normalization and regenerate docs

Author: flub

Makefile

@@ -1,6 +1,11 @@
 # Set of targets useful for development/release process
 PYTHON = python2.7
 PATH := $(PWD)/.env/bin:$(PATH)
+REGENDOC_ARGS := \
+	--normalize "/={8,} (.*) ={8,}/======= \1 ========/" \
+	--normalize "/_{8,} (.*) _{8,}/_______ \1 ________/" \
+	--normalize "/in \d+.\d+ seconds/in 0.12 seconds/" \
+	--normalize "@/tmp/pytest-\d+/@/tmp/pytest-NaN/@"
 
 # prepare virtual python environment
 .env:
@@ -16,10 +21,11 @@ clean:
 
 # generate documentation
 docs: develop
-	find doc/en -name '*.txt' -not -path 'doc/en/_build/*' | xargs .env/bin/regendoc
+	find doc/en -name '*.txt' -not -path 'doc/en/_build/*' | xargs .env/bin/regendoc ${REGENDOC_ARGS}
 	cd doc/en; make html
 
 # upload documentation
 upload-docs: develop
-	find doc/en -name '*.txt' -not -path 'doc/en/_build/*' | xargs .env/bin/regendoc --update
-	cd doc/en; make install
+	find doc/en -name '*.txt' -not -path 'doc/en/_build/*' | xargs .env/bin/regendoc ${REGENDOC_ARGS} --update
+	#cd doc/en; make install
+

doc/en/assert.txt

@@ -25,23 +25,23 @@ to assert that your function returns a certain value. If this assertion fails
 you will see the return value of the function call::
 
     $ py.test test_assert1.py
-    =========================== test session starts ============================
-    platform linux -- Python 3.4.1 -- py-1.4.27 -- pytest-2.7.1
-    rootdir: /tmp/doc-exec-87, inifile: 
+    ======= test session starts ========
+    platform linux2 -- Python 2.7.9, pytest-2.8.0.dev4, py-1.4.28, pluggy-0.3.0
+    rootdir: $REGENDOC_TMPDIR, inifile: 
     collected 1 items
 
     test_assert1.py F
 
-    ================================= FAILURES =================================
-    ______________________________ test_function _______________________________
+    ======= 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 =========================
+    ======= 1 failed in 0.12 seconds ========
 
 ``pytest`` has support for showing the values of the most common subexpressions
 including calls, attributes, comparisons, and binary and unary
@@ -135,15 +135,15 @@ when it encounters comparisons.  For example::
 if you run this module::
 
     $ py.test test_assert2.py
-    =========================== test session starts ============================
-    platform linux -- Python 3.4.1 -- py-1.4.27 -- pytest-2.7.1
-    rootdir: /tmp/doc-exec-87, inifile: 
+    ======= test session starts ========
+    platform linux2 -- Python 2.7.9, pytest-2.8.0.dev4, py-1.4.28, pluggy-0.3.0
+    rootdir: $REGENDOC_TMPDIR, inifile: 
     collected 1 items
 
     test_assert2.py F
 
-    ================================= FAILURES =================================
-    ___________________________ test_set_comparison ____________________________
+    ======= FAILURES ========
+    _______ test_set_comparison ________
 
         def test_set_comparison():
             set1 = set("1308")
@@ -157,7 +157,7 @@ if you run this module::
     E         Use -v to get the full diff
 
     test_assert2.py:5: AssertionError
-    ========================= 1 failed in 0.01 seconds =========================
+    ======= 1 failed in 0.12 seconds ========
 
 Special comparisons are done for a number of cases:
 
@@ -202,8 +202,8 @@ the conftest file::
 
    $ py.test -q test_foocompare.py
    F
-   ================================= FAILURES =================================
-   _______________________________ test_compare _______________________________
+   ======= FAILURES ========
+   _______ test_compare ________
 
        def test_compare():
            f1 = Foo(1)
@@ -213,7 +213,7 @@ the conftest file::
    E            vals: 1 != 2
 
    test_foocompare.py:8: AssertionError
-   1 failed in 0.01 seconds
+   1 failed in 0.12 seconds
 
 .. _assert-details:
 .. _`assert introspection`:

doc/en/builtin.txt

@@ -115,4 +115,4 @@ You can ask for available builtin or project-custom
         directory.  The returned object is a `py.path.local`_
         path object.
 
-     in 0.00 seconds
+     in 0.12 seconds

doc/en/capture.txt

@@ -63,24 +63,24 @@ and running this module will show you precisely the output
 of the failing function and hide the other one::
 
     $ py.test
-    =========================== test session starts ============================
-    platform linux -- Python 3.4.1 -- py-1.4.27 -- pytest-2.7.1
-    rootdir: /tmp/doc-exec-90, inifile: 
+    ======= test session starts ========
+    platform linux2 -- Python 2.7.9, pytest-2.8.0.dev4, py-1.4.28, pluggy-0.3.0
+    rootdir: $REGENDOC_TMPDIR, inifile: 
     collected 2 items
 
     test_module.py .F
 
-    ================================= FAILURES =================================
-    ________________________________ test_func2 ________________________________
+    ======= FAILURES ========
+    _______ test_func2 ________
 
         def test_func2():
     >       assert False
     E       assert False
 
     test_module.py:9: AssertionError
-    -------------------------- Captured stdout setup ---------------------------
-    setting up <function test_func2 at 0x7fa678d6eb70>
-    ==================== 1 failed, 1 passed in 0.01 seconds ====================
+    ---------------------------- Captured stdout setup -----------------------------
+    setting up <function test_func2 at 0xdeadbeef>
+    ======= 1 failed, 1 passed in 0.12 seconds ========
 
 Accessing captured output from a test function
 ---------------------------------------------------

doc/en/doctest.txt

@@ -43,14 +43,14 @@ and another like this::
 then you can just invoke ``py.test`` without command line options::
 
     $ py.test
-    =========================== test session starts ============================
-    platform linux -- Python 3.4.1 -- py-1.4.27 -- pytest-2.7.1
-    rootdir: /tmp/doc-exec-96, inifile: pytest.ini
+    ======= test session starts ========
+    platform linux2 -- Python 2.7.9, pytest-2.8.0.dev4, py-1.4.28, pluggy-0.3.0
+    rootdir: $REGENDOC_TMPDIR, inifile: pytest.ini
     collected 1 items
 
     mymodule.py .
 
-    ========================= 1 passed in 0.06 seconds =========================
+    ======= 1 passed in 0.12 seconds ========
 
 It is possible to use fixtures using the ``getfixture`` helper::