[Pytest-commit] commit/pytest: hpk42: regen docs for pytest-2.6
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Jul 17 16:55:37 CEST 2014
1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/902bf34b5c9b/
Changeset: 902bf34b5c9b
User: hpk42
Date: 2014-07-17 16:55:24
Summary: regen docs for pytest-2.6
Affected #: 19 files
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/assert.txt
--- a/doc/en/assert.txt
+++ b/doc/en/assert.txt
@@ -26,7 +26,7 @@
$ py.test test_assert1.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_assert1.py F
@@ -116,7 +116,7 @@
$ py.test test_assert2.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_assert2.py F
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/builtin.txt
--- a/doc/en/builtin.txt
+++ b/doc/en/builtin.txt
@@ -80,7 +80,7 @@
capfd
enables capturing of writes to file descriptors 1 and 2 and makes
- captured output available via ``capsys.readouterr()`` method calls
+ captured output available via ``capfd.readouterr()`` method calls
which return a ``(out, err)`` tuple.
monkeypatch
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/capture.txt
--- a/doc/en/capture.txt
+++ b/doc/en/capture.txt
@@ -64,7 +64,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py .F
@@ -77,8 +77,8 @@
E assert False
test_module.py:9: AssertionError
- ----------------------------- Captured stdout ------------------------------
- setting up <function test_func2 at 0x1ec25f0>
+ -------------------------- Captured stdout setup ---------------------------
+ setting up <function test_func2 at 0x2abe0d7241b8>
==================== 1 failed, 1 passed in 0.01 seconds ====================
Accessing captured output from a test function
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/conf.py
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -54,7 +54,7 @@
# General information about the project.
project = u'pytest'
-copyright = u'2013, holger krekel'
+copyright = u'2014, holger krekel'
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/doctest.txt
--- a/doc/en/doctest.txt
+++ b/doc/en/doctest.txt
@@ -44,12 +44,12 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
mymodule.py .
- ========================= 1 passed in 0.01 seconds =========================
+ ========================= 1 passed in 0.04 seconds =========================
It is possible to use fixtures using the ``getfixture`` helper::
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/markers.txt
--- a/doc/en/example/markers.txt
+++ b/doc/en/example/markers.txt
@@ -31,10 +31,10 @@
$ py.test -v -m webtest
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
- test_server.py:3: test_send_http PASSED
+ test_server.py at 3::test_send_http PASSED
=================== 3 tests deselected by "-m 'webtest'" ===================
================== 1 passed, 3 deselected in 0.01 seconds ==================
@@ -43,12 +43,12 @@
$ py.test -v -m "not webtest"
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
- test_server.py:6: test_something_quick PASSED
- test_server.py:8: test_another PASSED
- test_server.py:11: TestClass.test_method PASSED
+ test_server.py at 6::test_something_quick PASSED
+ test_server.py at 8::test_another PASSED
+ test_server.py at 11::TestClass::test_method PASSED
================= 1 tests deselected by "-m 'not webtest'" =================
================== 3 passed, 1 deselected in 0.01 seconds ==================
@@ -62,36 +62,35 @@
$ py.test -v test_server.py::TestClass::test_method
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
- collecting ... collected 4 items
-
- test_server.py:11: TestClass.test_method PASSED
-
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ collecting ... collected 5 items
+
+ test_server.py at 11::TestClass::test_method PASSED
+
========================= 1 passed in 0.01 seconds =========================
You can also select on the class::
$ py.test -v test_server.py::TestClass
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
-
- test_server.py:11: TestClass.test_method PASSED
-
+
+ test_server.py at 11::TestClass::test_method PASSED
+
========================= 1 passed in 0.01 seconds =========================
Or select multiple nodes::
$ py.test -v test_server.py::TestClass test_server.py::test_send_http
- =========================== test session starts ============================
- 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_server.py:11: TestClass.test_method PASSED
- test_server.py:3: test_send_http PASSED
-
- ========================= 2 passed in 0.01 seconds =========================
-
+ =========================== test session starts ============================
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ collecting ... collected 8 items
+
+ test_server.py at 11::TestClass::test_method PASSED
+ test_server.py at 3::test_send_http PASSED
+
+ ========================= 2 passed in 0.01 seconds =========================
.. _node-id:
@@ -121,10 +120,10 @@
$ py.test -v -k http # running with the above defined example module
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
- test_server.py:3: test_send_http PASSED
+ test_server.py at 3::test_send_http PASSED
====================== 3 tests deselected by '-khttp' ======================
================== 1 passed, 3 deselected in 0.01 seconds ==================
@@ -133,12 +132,12 @@
$ py.test -k "not send_http" -v
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
- test_server.py:6: test_something_quick PASSED
- test_server.py:8: test_another PASSED
- test_server.py:11: TestClass.test_method PASSED
+ test_server.py at 6::test_something_quick PASSED
+ test_server.py at 8::test_another PASSED
+ test_server.py at 11::TestClass::test_method PASSED
================= 1 tests deselected by '-knot send_http' ==================
================== 3 passed, 1 deselected in 0.01 seconds ==================
@@ -147,11 +146,11 @@
$ py.test -k "http or quick" -v
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 4 items
- test_server.py:3: test_send_http PASSED
- test_server.py:6: test_something_quick PASSED
+ test_server.py at 3::test_send_http PASSED
+ test_server.py at 6::test_something_quick PASSED
================= 2 tests deselected by '-khttp or quick' ==================
================== 2 passed, 2 deselected in 0.01 seconds ==================
@@ -327,7 +326,7 @@
$ py.test -E stage2
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_someenv.py s
@@ -338,7 +337,7 @@
$ py.test -E stage1
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_someenv.py .
@@ -456,12 +455,12 @@
$ py.test -rs # this option reports skip reasons
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_plat.py s.s.
========================= short test summary info ==========================
- SKIP [2] /tmp/doc-exec-65/conftest.py:12: cannot run on platform linux2
+ SKIP [2] /tmp/doc-exec-142/conftest.py:12: cannot run on platform linux2
=================== 2 passed, 2 skipped in 0.01 seconds ====================
@@ -469,7 +468,7 @@
$ py.test -m linux2
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_plat.py .
@@ -520,7 +519,7 @@
$ py.test -m interface --tb=short
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_module.py FF
@@ -528,12 +527,12 @@
================================= FAILURES =================================
__________________________ test_interface_simple ___________________________
test_module.py:3: in test_interface_simple
- > assert 0
- E assert 0
+ assert 0
+ E assert 0
__________________________ test_interface_complex __________________________
test_module.py:6: in test_interface_complex
- > assert 0
- E assert 0
+ assert 0
+ E assert 0
================== 2 tests deselected by "-m 'interface'" ==================
================== 2 failed, 2 deselected in 0.01 seconds ==================
@@ -541,7 +540,7 @@
$ py.test -m "interface or event" --tb=short
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_module.py FFF
@@ -549,15 +548,15 @@
================================= FAILURES =================================
__________________________ test_interface_simple ___________________________
test_module.py:3: in test_interface_simple
- > assert 0
- E assert 0
+ assert 0
+ E assert 0
__________________________ test_interface_complex __________________________
test_module.py:6: in test_interface_complex
- > assert 0
- E assert 0
+ assert 0
+ E assert 0
____________________________ test_event_simple _____________________________
test_module.py:9: in test_event_simple
- > assert 0
- E assert 0
+ assert 0
+ E assert 0
============= 1 tests deselected by "-m 'interface or event'" ==============
- ================== 3 failed, 1 deselected in 0.01 seconds ==================
+ ================== 3 failed, 1 deselected in 0.02 seconds ==================
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c 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 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
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 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /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 at 1::usecase: ok PASSED
+ test_simple.yml at 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 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
<YamlFile 'test_simple.yml'>
+ <YamlItem 'ok'><YamlItem 'hello'>
- <YamlItem 'ok'>
- ============================= in 0.02 seconds =============================
+ ============================= in 0.03 seconds =============================
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/parametrize.txt
--- a/doc/en/example/parametrize.txt
+++ b/doc/en/example/parametrize.txt
@@ -106,7 +106,7 @@
$ py.test test_scenarios.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_scenarios.py ....
@@ -118,7 +118,7 @@
$ py.test --collect-only test_scenarios.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
<Module 'test_scenarios.py'><Class 'TestSampleWithScenarios'>
@@ -182,7 +182,7 @@
$ py.test test_backends.py --collect-only
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
<Module 'test_backends.py'><Function 'test_db_initialized[d1]'>
@@ -197,7 +197,7 @@
================================= FAILURES =================================
_________________________ test_db_initialized[d2] __________________________
- db = <conftest.DB2 instance at 0x1e5f050>
+ db = <conftest.DB2 instance at 0x2b45c2b12050>
def test_db_initialized(db):
# a dummy test
@@ -253,7 +253,7 @@
================================= FAILURES =================================
________________________ TestClass.test_equals[1-2] ________________________
- self = <test_parametrize.TestClass instance at 0x246c4d0>, a = 1, b = 2
+ self = <test_parametrize.TestClass instance at 0x2acd519c6200>, a = 1, b = 2
def test_equals(self, a, b):
> assert a == b
@@ -279,10 +279,12 @@
Running it results in some skips if we don't have all the python interpreters installed and otherwise runs all combinations (5 interpreters times 5 interpreters times 3 objects to serialize/deserialize)::
. $ py.test -rs -q multipython.py
- ............sss............sss............sss............ssssssssssssssssss
+ ssssssssssssssssssssssssssssssssssss......sssssssss......ssssssssssssssssss
========================= short test summary info ==========================
- SKIP [27] /home/hpk/p/pytest/doc/en/example/multipython.py:22: 'python2.8' not found
- 48 passed, 27 skipped in 1.30 seconds
+ SKIP [21] /home/hpk/p/pytest/doc/en/example/multipython.py:22: 'python2.4' not found
+ SKIP [21] /home/hpk/p/pytest/doc/en/example/multipython.py:22: 'python2.8' not found
+ SKIP [21] /home/hpk/p/pytest/doc/en/example/multipython.py:22: 'python2.5' not found
+ 12 passed, 63 skipped in 0.66 seconds
Indirect parametrization of optional implementations/imports
--------------------------------------------------------------------
@@ -329,12 +331,12 @@
$ py.test -rs test_module.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py .s
========================= short test summary info ==========================
- SKIP [1] /tmp/doc-exec-67/conftest.py:10: could not import 'opt2'
+ SKIP [1] /tmp/doc-exec-144/conftest.py:10: could not import 'opt2'
=================== 1 passed, 1 skipped in 0.01 seconds ====================
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/pythoncollection.txt
--- a/doc/en/example/pythoncollection.txt
+++ b/doc/en/example/pythoncollection.txt
@@ -43,7 +43,7 @@
$ py.test --collect-only
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
<Module 'check_myapp.py'><Class 'CheckMyApp'>
@@ -88,7 +88,7 @@
. $ py.test --collect-only pythoncollection.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 3 items
<Module 'pythoncollection.py'><Function 'test_function'>
@@ -141,7 +141,7 @@
$ py.test --collect-only
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
<Module 'pkg/module_py2.py'><Function 'test_only_on_python2'>
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/reportingdemo.txt
--- a/doc/en/example/reportingdemo.txt
+++ b/doc/en/example/reportingdemo.txt
@@ -13,7 +13,7 @@
assertion $ py.test failure_demo.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 39 items
failure_demo.py FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
@@ -30,7 +30,7 @@
failure_demo.py:15: AssertionError
_________________________ TestFailing.test_simple __________________________
- self = <failure_demo.TestFailing object at 0x29e5210>
+ self = <failure_demo.TestFailing object at 0x2afa614fb790>
def test_simple(self):
def f():
@@ -40,13 +40,13 @@
> assert f() == g()
E assert 42 == 43
- E + where 42 = <function f at 0x296a9b0>()
- E + and 43 = <function g at 0x296aa28>()
+ E + where 42 = <function f at 0x2afa6158a5f0>()
+ E + and 43 = <function g at 0x2afa6158a7d0>()
failure_demo.py:28: AssertionError
____________________ TestFailing.test_simple_multiline _____________________
- self = <failure_demo.TestFailing object at 0x29cef50>
+ self = <failure_demo.TestFailing object at 0x2afa60d16b50>
def test_simple_multiline(self):
otherfunc_multi(
@@ -66,19 +66,19 @@
failure_demo.py:11: AssertionError
___________________________ TestFailing.test_not ___________________________
- self = <failure_demo.TestFailing object at 0x29be250>
+ self = <failure_demo.TestFailing object at 0x2afa61560ad0>
def test_not(self):
def f():
return 42
> assert not f()
E assert not 42
- E + where 42 = <function f at 0x296ac08>()
+ E + where 42 = <function f at 0x2afa6158a6e0>()
failure_demo.py:38: AssertionError
_________________ TestSpecialisedExplanations.test_eq_text _________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29c3990>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa6154fc90>
def test_eq_text(self):
> assert 'spam' == 'eggs'
@@ -89,7 +89,7 @@
failure_demo.py:42: AssertionError
_____________ TestSpecialisedExplanations.test_eq_similar_text _____________
- self = <failure_demo.TestSpecialisedExplanations object at 0x2acef90>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60da1d10>
def test_eq_similar_text(self):
> assert 'foo 1 bar' == 'foo 2 bar'
@@ -102,7 +102,7 @@
failure_demo.py:45: AssertionError
____________ TestSpecialisedExplanations.test_eq_multiline_text ____________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29f1f50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60d45a90>
def test_eq_multiline_text(self):
> assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
@@ -115,7 +115,7 @@
failure_demo.py:48: AssertionError
______________ TestSpecialisedExplanations.test_eq_long_text _______________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29e58d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60d0de50>
def test_eq_long_text(self):
a = '1'*100 + 'a' + '2'*100
@@ -132,7 +132,7 @@
failure_demo.py:53: AssertionError
_________ TestSpecialisedExplanations.test_eq_long_text_multiline __________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29cee50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa6154fbd0>
def test_eq_long_text_multiline(self):
a = '1\n'*100 + 'a' + '2\n'*100
@@ -156,7 +156,7 @@
failure_demo.py:58: AssertionError
_________________ TestSpecialisedExplanations.test_eq_list _________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29c3810>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60d16290>
def test_eq_list(self):
> assert [0, 1, 2] == [0, 1, 3]
@@ -166,7 +166,7 @@
failure_demo.py:61: AssertionError
______________ TestSpecialisedExplanations.test_eq_list_long _______________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29e50d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60da1c50>
def test_eq_list_long(self):
a = [0]*100 + [1] + [3]*100
@@ -178,7 +178,7 @@
failure_demo.py:66: AssertionError
_________________ TestSpecialisedExplanations.test_eq_dict _________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29c5dd0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60d45d90>
def test_eq_dict(self):
> assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
@@ -194,7 +194,7 @@
failure_demo.py:69: AssertionError
_________________ TestSpecialisedExplanations.test_eq_set __________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29e2690>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa614fb3d0>
def test_eq_set(self):
> assert set([0, 10, 11, 12]) == set([0, 20, 21])
@@ -210,7 +210,7 @@
failure_demo.py:72: AssertionError
_____________ TestSpecialisedExplanations.test_eq_longer_list ______________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29ceb50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa61560bd0>
def test_eq_longer_list(self):
> assert [1,2] == [1,2,3]
@@ -220,7 +220,7 @@
failure_demo.py:75: AssertionError
_________________ TestSpecialisedExplanations.test_in_list _________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29c3050>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa6154fc10>
def test_in_list(self):
> assert 1 in [0, 2, 3, 4, 5]
@@ -229,7 +229,7 @@
failure_demo.py:78: AssertionError
__________ TestSpecialisedExplanations.test_not_in_text_multiline __________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29e5b10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60d0db50>
def test_not_in_text_multiline(self):
text = 'some multiline\ntext\nwhich\nincludes foo\nand a\ntail'
@@ -247,7 +247,7 @@
failure_demo.py:82: AssertionError
___________ TestSpecialisedExplanations.test_not_in_text_single ____________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29f1610>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa61548810>
def test_not_in_text_single(self):
text = 'single foo line'
@@ -260,7 +260,7 @@
failure_demo.py:86: AssertionError
_________ TestSpecialisedExplanations.test_not_in_text_single_long _________
- self = <failure_demo.TestSpecialisedExplanations object at 0x29cea50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa614f9fd0>
def test_not_in_text_single_long(self):
text = 'head ' * 50 + 'foo ' + 'tail ' * 20
@@ -273,7 +273,7 @@
failure_demo.py:90: AssertionError
______ TestSpecialisedExplanations.test_not_in_text_single_long_term _______
- self = <failure_demo.TestSpecialisedExplanations object at 0x29e2a10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x2afa60da1d50>
def test_not_in_text_single_long_term(self):
text = 'head ' * 50 + 'f'*70 + 'tail ' * 20
@@ -292,7 +292,7 @@
i = Foo()
> assert i.b == 2
E assert 1 == 2
- E + where 1 = <failure_demo.Foo object at 0x29c77d0>.b
+ E + where 1 = <failure_demo.Foo object at 0x2afa61548510>.b
failure_demo.py:101: AssertionError
_________________________ test_attribute_instance __________________________
@@ -302,8 +302,8 @@
b = 1
> assert Foo().b == 2
E assert 1 == 2
- E + where 1 = <failure_demo.Foo object at 0x29e5f10>.b
- E + where <failure_demo.Foo object at 0x29e5f10> = <class 'failure_demo.Foo'>()
+ E + where 1 = <failure_demo.Foo object at 0x2afa60d16610>.b
+ E + where <failure_demo.Foo object at 0x2afa60d16610> = <class 'failure_demo.Foo'>()
failure_demo.py:107: AssertionError
__________________________ test_attribute_failure __________________________
@@ -319,7 +319,7 @@
failure_demo.py:116:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
- self = <failure_demo.Foo object at 0x29e6b10>
+ self = <failure_demo.Foo object at 0x2afa614fb1d0>
def _get_b(self):
> raise Exception('Failed to get attrib')
@@ -335,15 +335,15 @@
b = 2
> assert Foo().b == Bar().b
E assert 1 == 2
- 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'>()
+ E + where 1 = <failure_demo.Foo object at 0x2afa60da1f50>.b
+ E + where <failure_demo.Foo object at 0x2afa60da1f50> = <class 'failure_demo.Foo'>()
+ E + and 2 = <failure_demo.Bar object at 0x2afa61505c50>.b
+ E + where <failure_demo.Bar object at 0x2afa61505c50> = <class 'failure_demo.Bar'>()
failure_demo.py:124: AssertionError
__________________________ TestRaises.test_raises __________________________
- self = <failure_demo.TestRaises instance at 0x2aec878>
+ self = <failure_demo.TestRaises instance at 0x2afa60d78440>
def test_raises(self):
s = 'qwe'
@@ -355,10 +355,10 @@
> 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:999>:1: ValueError
+ <0-codegen /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:1028>:1: ValueError
______________________ TestRaises.test_raises_doesnt _______________________
- self = <failure_demo.TestRaises instance at 0x2aafef0>
+ self = <failure_demo.TestRaises instance at 0x2afa6153a7a0>
def test_raises_doesnt(self):
> raises(IOError, "int('3')")
@@ -367,7 +367,7 @@
failure_demo.py:136: Failed
__________________________ TestRaises.test_raise ___________________________
- self = <failure_demo.TestRaises instance at 0x2ae5758>
+ self = <failure_demo.TestRaises instance at 0x2afa61542128>
def test_raise(self):
> raise ValueError("demo error")
@@ -376,7 +376,7 @@
failure_demo.py:139: ValueError
________________________ TestRaises.test_tupleerror ________________________
- self = <failure_demo.TestRaises instance at 0x29cf4d0>
+ self = <failure_demo.TestRaises instance at 0x2afa60dc9e60>
def test_tupleerror(self):
> a,b = [1]
@@ -385,7 +385,7 @@
failure_demo.py:142: ValueError
______ TestRaises.test_reinterpret_fails_with_print_for_the_fun_of_it ______
- self = <failure_demo.TestRaises instance at 0x29cf9e0>
+ self = <failure_demo.TestRaises instance at 0x2afa60d69b90>
def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
l = [1,2,3]
@@ -394,11 +394,11 @@
E TypeError: 'int' object is not iterable
failure_demo.py:147: TypeError
- ----------------------------- Captured stdout ------------------------------
+ --------------------------- Captured stdout call ---------------------------
l is [1, 2, 3]
________________________ TestRaises.test_some_error ________________________
- self = <failure_demo.TestRaises instance at 0x29d9ea8>
+ self = <failure_demo.TestRaises instance at 0x2afa60d5c680>
def test_some_error(self):
> if namenotexi:
@@ -426,7 +426,7 @@
<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 0x29ca8c0>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d6b1b8>
def test_complex_error(self):
def f():
@@ -437,13 +437,8 @@
failure_demo.py:175:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-
- x = 44, y = 43
-
- def somefunc(x,y):
- > otherfunc(x,y)
-
- failure_demo.py:8:
+ failure_demo.py:8: in somefunc
+ otherfunc(x,y)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
a = 44, b = 43
@@ -455,7 +450,7 @@
failure_demo.py:5: AssertionError
___________________ TestMoreErrors.test_z1_unpack_error ____________________
- self = <failure_demo.TestMoreErrors instance at 0x2ae2ea8>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa61546ef0>
def test_z1_unpack_error(self):
l = []
@@ -465,7 +460,7 @@
failure_demo.py:179: ValueError
____________________ TestMoreErrors.test_z2_type_error _____________________
- self = <failure_demo.TestMoreErrors instance at 0x29da518>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d5e680>
def test_z2_type_error(self):
l = 3
@@ -475,19 +470,19 @@
failure_demo.py:183: TypeError
______________________ TestMoreErrors.test_startswith ______________________
- self = <failure_demo.TestMoreErrors instance at 0x29b8440>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d697e8>
def test_startswith(self):
s = "123"
g = "456"
> assert s.startswith(g)
- 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 assert <built-in method startswith of str object at 0x2afa61549a08>('456')
+ E + where <built-in method startswith of str object at 0x2afa61549a08> = '123'.startswith
failure_demo.py:188: AssertionError
__________________ TestMoreErrors.test_startswith_nested ___________________
- self = <failure_demo.TestMoreErrors instance at 0x2ae4e18>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d4dfc8>
def test_startswith_nested(self):
def f():
@@ -495,15 +490,15 @@
def g():
return "456"
> assert f().startswith(g())
- 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>()
+ E assert <built-in method startswith of str object at 0x2afa61549a08>('456')
+ E + where <built-in method startswith of str object at 0x2afa61549a08> = '123'.startswith
+ E + where '123' = <function f at 0x2afa60d37b90>()
+ E + and '456' = <function g at 0x2afa60d37e60>()
failure_demo.py:195: AssertionError
_____________________ TestMoreErrors.test_global_func ______________________
- self = <failure_demo.TestMoreErrors instance at 0x2abf320>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d4ecf8>
def test_global_func(self):
> assert isinstance(globf(42), float)
@@ -513,18 +508,18 @@
failure_demo.py:198: AssertionError
_______________________ TestMoreErrors.test_instance _______________________
- self = <failure_demo.TestMoreErrors instance at 0x2aaf050>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa614fea28>
def test_instance(self):
self.x = 6*7
> assert self.x != 42
E assert 42 != 42
- E + where 42 = <failure_demo.TestMoreErrors instance at 0x2aaf050>.x
+ E + where 42 = <failure_demo.TestMoreErrors instance at 0x2afa614fea28>.x
failure_demo.py:202: AssertionError
_______________________ TestMoreErrors.test_compare ________________________
- self = <failure_demo.TestMoreErrors instance at 0x2aedbd8>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa614fe0e0>
def test_compare(self):
> assert globf(10) < 5
@@ -534,7 +529,7 @@
failure_demo.py:205: AssertionError
_____________________ TestMoreErrors.test_try_finally ______________________
- self = <failure_demo.TestMoreErrors instance at 0x29f2098>
+ self = <failure_demo.TestMoreErrors instance at 0x2afa60d6b830>
def test_try_finally(self):
x = 1
@@ -543,4 +538,4 @@
E assert 1 == 0
failure_demo.py:210: AssertionError
- ======================== 39 failed in 0.20 seconds =========================
+ ======================== 39 failed in 0.21 seconds =========================
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/simple.txt
--- a/doc/en/example/simple.txt
+++ b/doc/en/example/simple.txt
@@ -41,9 +41,9 @@
F
================================= FAILURES =================================
_______________________________ test_answer ________________________________
-
+
cmdopt = 'type1'
-
+
def test_answer(cmdopt):
if cmdopt == "type1":
print ("first")
@@ -51,9 +51,9 @@
print ("second")
> assert 0 # to see what was printed
E assert 0
-
+
test_sample.py:6: AssertionError
- ----------------------------- Captured stdout ------------------------------
+ --------------------------- Captured stdout call ---------------------------
first
1 failed in 0.01 seconds
@@ -63,9 +63,9 @@
F
================================= FAILURES =================================
_______________________________ test_answer ________________________________
-
+
cmdopt = 'type2'
-
+
def test_answer(cmdopt):
if cmdopt == "type1":
print ("first")
@@ -73,9 +73,9 @@
print ("second")
> assert 0 # to see what was printed
E assert 0
-
+
test_sample.py:6: AssertionError
- ----------------------------- Captured stdout ------------------------------
+ --------------------------- Captured stdout call ---------------------------
second
1 failed in 0.01 seconds
@@ -108,7 +108,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 0 items
============================= in 0.00 seconds =============================
@@ -152,12 +152,12 @@
$ py.test -rs # "-rs" means report details on the little 's'
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py .s
========================= short test summary info ==========================
- SKIP [1] /tmp/doc-exec-70/conftest.py:9: need --runslow option to run
+ SKIP [1] /tmp/doc-exec-147/conftest.py:9: need --runslow option to run
=================== 1 passed, 1 skipped in 0.01 seconds ====================
@@ -165,7 +165,7 @@
$ py.test --runslow
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py ..
@@ -256,7 +256,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
project deps: mylib-1.1
collected 0 items
@@ -279,7 +279,7 @@
$ py.test -v
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
info1: did you know that ...
did you?
collecting ... collected 0 items
@@ -290,7 +290,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 0 items
============================= in 0.00 seconds =============================
@@ -322,7 +322,7 @@
$ py.test --durations=3
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 3 items
test_some_are_slow.py ...
@@ -330,7 +330,7 @@
========================= 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 setup test_some_are_slow.py::test_funcfast
+ 0.00s setup test_some_are_slow.py::test_funcslow2
========================= 3 passed in 0.31 seconds =========================
incremental testing - test steps
@@ -383,7 +383,7 @@
$ py.test -rx
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 4 items
test_step.py .Fx.
@@ -391,7 +391,7 @@
================================= FAILURES =================================
____________________ TestUserHandling.test_modification ____________________
- self = <test_step.TestUserHandling instance at 0x2768dd0>
+ self = <test_step.TestUserHandling instance at 0x2aca13f66e18>
def test_modification(self):
> assert 0
@@ -453,7 +453,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 7 items
test_step.py .Fx.
@@ -463,17 +463,17 @@
================================== ERRORS ==================================
_______________________ ERROR at setup of test_root ________________________
- file /tmp/doc-exec-70/b/test_error.py, line 1
+ file /tmp/doc-exec-147/b/test_error.py, line 1
def test_root(db): # no db here, will error out
fixture 'db' not found
- available fixtures: pytestconfig, capfd, monkeypatch, capsys, recwarn, tmpdir
+ available fixtures: tmpdir, monkeypatch, pytestconfig, recwarn, capsys, capfd
use 'py.test --fixtures [testpath]' for help on them.
- /tmp/doc-exec-70/b/test_error.py:1
+ /tmp/doc-exec-147/b/test_error.py:1
================================= FAILURES =================================
____________________ TestUserHandling.test_modification ____________________
- self = <test_step.TestUserHandling instance at 0x238fdd0>
+ self = <test_step.TestUserHandling instance at 0x2afc14d78e18>
def test_modification(self):
> assert 0
@@ -482,20 +482,20 @@
test_step.py:9: AssertionError
_________________________________ test_a1 __________________________________
- db = <conftest.DB instance at 0x23f9998>
+ db = <conftest.DB instance at 0x2afc145495a8>
def test_a1(db):
> assert 0, db # to show value
- E AssertionError: <conftest.DB instance at 0x23f9998>
+ E AssertionError: <conftest.DB instance at 0x2afc145495a8>
a/test_db.py:2: AssertionError
_________________________________ test_a2 __________________________________
- db = <conftest.DB instance at 0x23f9998>
+ db = <conftest.DB instance at 0x2afc145495a8>
def test_a2(db):
> assert 0, db # to show value
- E AssertionError: <conftest.DB instance at 0x23f9998>
+ E AssertionError: <conftest.DB instance at 0x2afc145495a8>
a/test_db2.py:2: AssertionError
========== 3 failed, 2 passed, 1 xfailed, 1 error in 0.03 seconds ==========
@@ -553,7 +553,7 @@
$ py.test test_module.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py FF
@@ -561,7 +561,7 @@
================================= FAILURES =================================
________________________________ test_fail1 ________________________________
- tmpdir = local('/tmp/pytest-1012/test_fail10')
+ tmpdir = local('/tmp/pytest-28/test_fail10')
def test_fail1(tmpdir):
> assert 0
@@ -580,7 +580,7 @@
you will have a "failures" file which contains the failing test ids::
$ cat failures
- test_module.py::test_fail1 (/tmp/pytest-1012/test_fail10)
+ test_module.py::test_fail1 (/tmp/pytest-28/test_fail10)
test_module.py::test_fail2
Making test result information available in fixtures
@@ -643,7 +643,7 @@
$ py.test -s test_module.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 3 items
test_module.py Esetting up a test failed! test_module.py::test_setup_fails
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/example/special.txt
--- a/doc/en/example/special.txt
+++ b/doc/en/example/special.txt
@@ -69,4 +69,4 @@
.test other
.test_unit1 method called
.
- 4 passed in 0.01 seconds
+ 4 passed in 0.03 seconds
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/fixture.txt
--- a/doc/en/fixture.txt
+++ b/doc/en/fixture.txt
@@ -76,7 +76,7 @@
$ py.test test_smtpsimple.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_smtpsimple.py F
@@ -84,7 +84,7 @@
================================= FAILURES =================================
________________________________ test_ehlo _________________________________
- smtp = <smtplib.SMTP instance at 0x15cc0e0>
+ smtp = <smtplib.SMTP instance at 0x2b8dbdd43638>
def test_ehlo(smtp):
response, msg = smtp.ehlo()
@@ -94,7 +94,7 @@
E assert 0
test_smtpsimple.py:12: AssertionError
- ========================= 1 failed in 0.21 seconds =========================
+ ========================= 1 failed in 0.15 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
@@ -194,7 +194,7 @@
$ py.test test_module.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_module.py FF
@@ -202,7 +202,7 @@
================================= FAILURES =================================
________________________________ test_ehlo _________________________________
- smtp = <smtplib.SMTP instance at 0x237b638>
+ smtp = <smtplib.SMTP instance at 0x2b0d30a59f38>
def test_ehlo(smtp):
response = smtp.ehlo()
@@ -214,7 +214,7 @@
test_module.py:6: AssertionError
________________________________ test_noop _________________________________
- smtp = <smtplib.SMTP instance at 0x237b638>
+ smtp = <smtplib.SMTP instance at 0x2b0d30a59f38>
def test_noop(smtp):
response = smtp.noop()
@@ -223,7 +223,7 @@
E assert 0
test_module.py:11: AssertionError
- ========================= 2 failed in 0.23 seconds =========================
+ ========================= 2 failed in 0.16 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 @@
$ py.test -s -q --tb=no
FFteardown smtp
- 2 failed in 0.21 seconds
+ 2 failed in 0.16 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.59 seconds
+ 2 failed in 0.17 seconds
Let's quickly create another test module that actually sets the
server URL in its module namespace::
@@ -331,8 +331,8 @@
================================= FAILURES =================================
______________________________ test_showhelo _______________________________
test_anothersmtp.py:5: in test_showhelo
- > assert 0, smtp.helo()
- E AssertionError: (250, 'mail.python.org')
+ assert 0, smtp.helo()
+ E AssertionError: (250, 'mail.python.org')
voila! The ``smtp`` fixture function picked up our mail server name
from the module namespace.
@@ -379,7 +379,7 @@
================================= FAILURES =================================
__________________________ test_ehlo[merlinux.eu] __________________________
- smtp = <smtplib.SMTP instance at 0x21f3e60>
+ smtp = <smtplib.SMTP instance at 0x2ba3fee43950>
def test_ehlo(smtp):
response = smtp.ehlo()
@@ -391,7 +391,7 @@
test_module.py:6: AssertionError
__________________________ test_noop[merlinux.eu] __________________________
- smtp = <smtplib.SMTP instance at 0x21f3e60>
+ smtp = <smtplib.SMTP instance at 0x2ba3fee43950>
def test_noop(smtp):
response = smtp.noop()
@@ -402,20 +402,20 @@
test_module.py:11: AssertionError
________________________ test_ehlo[mail.python.org] ________________________
- smtp = <smtplib.SMTP instance at 0x22047e8>
+ smtp = <smtplib.SMTP instance at 0x2ba3fedf9ea8>
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'
+ E assert 'merlinux' in 'mail.python.org\nSIZE 25600000\nETRN\nSTARTTLS\nENHANCEDSTATUSCODES\n8BITMIME\nDSN\nSMTPUTF8'
test_module.py:5: AssertionError
- ----------------------------- Captured stdout ------------------------------
- finalizing <smtplib.SMTP instance at 0x21f3e60>
+ -------------------------- Captured stdout setup ---------------------------
+ finalizing <smtplib.SMTP instance at 0x2ba3fee43950>
________________________ test_noop[mail.python.org] ________________________
- smtp = <smtplib.SMTP instance at 0x22047e8>
+ smtp = <smtplib.SMTP instance at 0x2ba3fedf9ea8>
def test_noop(smtp):
response = smtp.noop()
@@ -424,7 +424,7 @@
E assert 0
test_module.py:11: AssertionError
- 4 failed in 6.06 seconds
+ 4 failed in 5.62 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 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /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
+ test_appsetup.py at 12::test_smtp_exists[merlinux.eu] PASSED
+ test_appsetup.py at 12::test_smtp_exists[mail.python.org] PASSED
- ========================= 2 passed in 6.42 seconds =========================
+ ========================= 2 passed in 6.27 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,26 +528,26 @@
$ py.test -v -s test_module.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2 -- /home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0 -- /home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 8 items
- test_module.py:15: test_0[1] test0 1
+ test_module.py at 15::test_0[1] test0 1
PASSED
- test_module.py:15: test_0[2] test0 2
+ test_module.py at 15::test_0[2] test0 2
PASSED
- test_module.py:17: test_1[mod1] create mod1
+ test_module.py at 17::test_1[mod1] create mod1
test1 mod1
PASSED
- test_module.py:19: test_2[1-mod1] test2 1 mod1
+ test_module.py at 19::test_2[1-mod1] test2 1 mod1
PASSED
- test_module.py:19: test_2[2-mod1] test2 2 mod1
+ test_module.py at 19::test_2[2-mod1] test2 2 mod1
PASSED
- test_module.py:17: test_1[mod2] create mod2
+ test_module.py at 17::test_1[mod2] create mod2
test1 mod2
PASSED
- test_module.py:19: test_2[1-mod2] test2 1 mod2
+ test_module.py at 19::test_2[1-mod2] test2 1 mod2
PASSED
- test_module.py:19: test_2[2-mod2] test2 2 mod2
+ test_module.py at 19::test_2[2-mod2] test2 2 mod2
PASSED
========================= 8 passed in 0.01 seconds =========================
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/getting-started.txt
--- a/doc/en/getting-started.txt
+++ b/doc/en/getting-started.txt
@@ -27,7 +27,7 @@
To check your installation has installed the correct version::
$ py.test --version
- This is pytest version 2.5.2, imported from /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.pyc
+ This is pytest version 2.6.0, 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`.
@@ -49,19 +49,19 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
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 =========================
@@ -97,7 +97,7 @@
$ py.test -q test_sysexit.py
.
- 1 passed in 0.01 seconds
+ 1 passed in 0.00 seconds
.. todo:: For further ways to assert exceptions see the `raises`
@@ -126,14 +126,14 @@
.F
================================= FAILURES =================================
____________________________ TestClass.test_two ____________________________
-
- self = <test_class.TestClass instance at 0x255a0e0>
-
+
+ self = <test_class.TestClass instance at 0x2b0b0ac73098>
+
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
@@ -162,17 +162,17 @@
F
================================= FAILURES =================================
_____________________________ test_needsfiles ______________________________
-
- tmpdir = local('/tmp/pytest-1008/test_needsfiles0')
-
+
+ tmpdir = local('/tmp/pytest-24/test_needsfiles0')
+
def test_needsfiles(tmpdir):
print tmpdir
> assert 0
E assert 0
-
+
test_tmpdir.py:3: AssertionError
- ----------------------------- Captured stdout ------------------------------
- /tmp/pytest-1008/test_needsfiles0
+ --------------------------- Captured stdout call ---------------------------
+ /tmp/pytest-24/test_needsfiles0
1 failed in 0.01 seconds
Before the test runs, a unique-per-test-invocation temporary directory
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/parametrize.txt
--- a/doc/en/parametrize.txt
+++ b/doc/en/parametrize.txt
@@ -53,7 +53,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 3 items
test_expectation.py ..F
@@ -100,7 +100,7 @@
$ py.test
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 3 items
test_expectation.py ..x
@@ -170,8 +170,8 @@
def test_valid_string(stringinput):
> assert stringinput.isalpha()
- E assert <built-in method isalpha of str object at 0x2b869b32b148>()
- E + where <built-in method isalpha of str object at 0x2b869b32b148> = '!'.isalpha
+ E assert <built-in method isalpha of str object at 0x2b7e70b5d210>()
+ E + where <built-in method isalpha of str object at 0x2b7e70b5d210> = '!'.isalpha
test_strings.py:3: AssertionError
1 failed in 0.01 seconds
@@ -185,7 +185,7 @@
$ py.test -q -rs test_strings.py
s
========================= short test summary info ==========================
- SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:1110: got empty parameter set, function test_valid_string at /tmp/doc-exec-24/test_strings.py:1
+ SKIP [1] /home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:1139: got empty parameter set, function test_valid_string at /tmp/doc-exec-100/test_strings.py:1
1 skipped in 0.01 seconds
For further examples, you might want to look at :ref:`more
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/skipping.txt
--- a/doc/en/skipping.txt
+++ b/doc/en/skipping.txt
@@ -159,7 +159,7 @@
example $ py.test -rx xfail_demo.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 6 items
xfail_demo.py xxxxxx
@@ -176,7 +176,7 @@
XFAIL xfail_demo.py::test_hello6
reason: reason
- ======================== 6 xfailed in 0.04 seconds =========================
+ ======================== 6 xfailed in 0.05 seconds =========================
.. _`skip/xfail with parametrize`:
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/tmpdir.txt
--- a/doc/en/tmpdir.txt
+++ b/doc/en/tmpdir.txt
@@ -29,7 +29,7 @@
$ py.test test_tmpdir.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 1 items
test_tmpdir.py F
@@ -37,7 +37,7 @@
================================= FAILURES =================================
_____________________________ test_create_file _____________________________
- tmpdir = local('/tmp/pytest-1009/test_create_file0')
+ tmpdir = local('/tmp/pytest-25/test_create_file0')
def test_create_file(tmpdir):
p = tmpdir.mkdir("sub").join("hello.txt")
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/unittest.txt
--- a/doc/en/unittest.txt
+++ b/doc/en/unittest.txt
@@ -88,7 +88,7 @@
$ py.test test_unittest_db.py
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- py-1.4.20 -- pytest-2.5.2
+ platform linux2 -- Python 2.7.6 -- py-1.4.22 -- pytest-2.6.0
collected 2 items
test_unittest_db.py FF
@@ -101,7 +101,7 @@
def test_method1(self):
assert hasattr(self, "db")
> assert 0, self.db # fail for demo purposes
- E AssertionError: <conftest.DummyDB instance at 0x12124d0>
+ E AssertionError: <conftest.DummyDB instance at 0x2ba71cccb128>
test_unittest_db.py:9: AssertionError
___________________________ MyTest.test_method2 ____________________________
@@ -110,10 +110,10 @@
def test_method2(self):
> assert 0, self.db # fail for demo purposes
- E AssertionError: <conftest.DummyDB instance at 0x12124d0>
+ E AssertionError: <conftest.DummyDB instance at 0x2ba71cccb128>
test_unittest_db.py:12: AssertionError
- ========================= 2 failed in 0.01 seconds =========================
+ ========================= 2 failed in 0.04 seconds =========================
This default pytest traceback shows that the two test methods
share the same ``self.db`` instance which was our intention
@@ -160,7 +160,7 @@
$ py.test -q test_unittest_cleandir.py
.
- 1 passed in 0.01 seconds
+ 1 passed in 0.03 seconds
... gives us one passed test because the ``initdir`` fixture function
was executed ahead of the ``test_method``.
diff -r 808a74ee97be149c9db577091fb5a7c09f069805 -r 902bf34b5c9b92fa8048f2e680e1a1d2469ab12c doc/en/yieldfixture.txt
--- a/doc/en/yieldfixture.txt
+++ b/doc/en/yieldfixture.txt
@@ -51,7 +51,7 @@
test called
.teardown after yield
- 1 passed in 0.00 seconds
+ 1 passed in 0.01 seconds
We can also seamlessly use the new syntax with ``with`` statements.
Let's simplify the above ``passwd`` fixture::
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