summaryrefslogtreecommitdiff
path: root/doc/en/unittest.rst
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2017-03-14 18:10:23 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2017-03-14 18:10:23 -0300
commit6c9011c12fd3b14d09562c6d391319e70883eef9 (patch)
tree0ee2774eb8a557f6fb168b72c20a44c311911cc0 /doc/en/unittest.rst
parentd1ea7c8cc8f304ba90900bdef0cfa73395a0fbd5 (diff)
parentfa15ae754500916eb5226adb1efaaf95f0ce4618 (diff)
downloadpytest-6c9011c12fd3b14d09562c6d391319e70883eef9.tar.gz
Merge branch 'master' into merge-master-into-features-post-3.0.7
Diffstat (limited to 'doc/en/unittest.rst')
-rw-r--r--doc/en/unittest.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/en/unittest.rst b/doc/en/unittest.rst
index 78aac427a..57e424511 100644
--- a/doc/en/unittest.rst
+++ b/doc/en/unittest.rst
@@ -108,8 +108,8 @@ the ``self.db`` values in the traceback::
$ pytest test_unittest_db.py
======= test session starts ========
- platform linux -- Python 3.5.2, pytest-3.0.6, py-1.4.33, pluggy-0.4.0
- rootdir: $REGENDOC_TMPDIR, inifile:
+ platform linux -- Python 3.5.2, pytest-3.0.7, py-1.4.32, pluggy-0.4.0
+ rootdir: $REGENDOC_TMPDIR, inifile:
collected 2 items
test_unittest_db.py FF