1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/1cc371f91516/
Changeset: 1cc371f91516
User: hpk42
Date: 2013-12-11 12:20:19
Summary: regen docs and bump version to 2.5.0
Affected #: 17 files
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
#
-__version__ = '2.5.0.dev1'
+__version__ = '2.5.0'
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_assert2.py F
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_module.py .F
@@ -78,7 +78,7 @@
test_module.py:9: AssertionError
----------------------------- Captured stdout
------------------------------
- setting up <function test_func2 at 0x282d2a8>
+ setting up <function test_func2 at 0x29437d0>
==================== 1 failed, 1 passed in 0.01 seconds
====================
Accessing captured output from a test function
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
mymodule.py .
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 doc/en/example/markers.txt
--- a/doc/en/example/markers.txt
+++ b/doc/en/example/markers.txt
@@ -28,7 +28,7 @@
$ py.test -v -m webtest
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 3 items
test_server.py:3: test_send_http PASSED
@@ -40,7 +40,7 @@
$ py.test -v -m "not webtest"
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 3 items
test_server.py:6: test_something_quick PASSED
@@ -61,7 +61,7 @@
$ py.test -v -k http # running with the above defined example module
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 3 items
test_server.py:3: test_send_http PASSED
@@ -73,7 +73,7 @@
$ py.test -k "not send_http" -v
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 3 items
test_server.py:6: test_something_quick PASSED
@@ -86,7 +86,7 @@
$ py.test -k "http or quick" -v
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 3 items
test_server.py:3: test_send_http PASSED
@@ -129,7 +129,7 @@
@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 multiple different argument value sets. 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.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
@@ -266,7 +266,7 @@
$ py.test -E stage2
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_someenv.py s
@@ -277,7 +277,7 @@
$ py.test -E stage1
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_someenv.py .
@@ -293,7 +293,7 @@
@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 multiple different argument value sets. 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.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
@@ -395,12 +395,12 @@
$ py.test -rs # this option reports skip reasons
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 4 items
test_plat.py s.s.
========================= short test summary info
==========================
- SKIP [2] /tmp/doc-exec-598/conftest.py:12: cannot run on platform linux2
+ SKIP [2] /tmp/doc-exec-62/conftest.py:12: cannot run on platform linux2
=================== 2 passed, 2 skipped in 0.01 seconds
====================
@@ -408,7 +408,7 @@
$ py.test -m linux2
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 4 items
test_plat.py .
@@ -459,7 +459,7 @@
$ py.test -m interface --tb=short
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 4 items
test_module.py FF
@@ -480,7 +480,7 @@
$ py.test -m "interface or event" --tb=short
=========================== test session starts ============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 4 items
test_module.py FFF
@@ -499,4 +499,4 @@
> assert 0
E assert 0
============= 1 tests deselected by "-m 'interface or event'" ==============
- ================== 3 failed, 1 deselected in 0.02 seconds ==================
+ ================== 3 failed, 1 deselected in 0.01 seconds ==================
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 doc/en/example/nonpython.txt
--- a/doc/en/example/nonpython.txt
+++ b/doc/en/example/nonpython.txt
@@ -27,7 +27,7 @@
nonpython $ py.test test_simple.yml
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_simple.yml .F
@@ -56,7 +56,7 @@
nonpython $ py.test -v
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 2 items
test_simple.yml:1: usecase: ok PASSED
@@ -74,7 +74,7 @@
nonpython $ py.test --collect-only
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
<YamlFile 'test_simple.yml'><YamlItem 'ok'>
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 0x2dbd950>
+ db = <conftest.DB2 instance at 0x1992c20>
def test_db_initialized(db):
# a dummy test
@@ -253,14 +253,14 @@
================================= FAILURES
=================================
________________________ TestClass.test_equals[1-2]
________________________
- self = <test_parametrize.TestClass instance at 0x258a6c8>, a = 1, b = 2
+ self = <test_parametrize.TestClass instance at 0x13483b0>, 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.02 seconds
+ 1 failed, 2 passed in 0.01 seconds
Indirect parametrization with multiple fixtures
--------------------------------------------------------------
@@ -282,7 +282,7 @@
............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.37 seconds
+ 48 passed, 27 skipped in 1.41 seconds
Indirect parametrization of optional implementations/imports
--------------------------------------------------------------------
@@ -329,12 +329,12 @@
$ py.test -rs test_module.py
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
- test_module.py s.
+ test_module.py .s
========================= short test summary info
==========================
- SKIP [1] /tmp/doc-exec-600/conftest.py:10: could not import 'opt2'
+ SKIP [1] /tmp/doc-exec-64/conftest.py:10: could not import 'opt2'
=================== 1 passed, 1 skipped in 0.01 seconds
====================
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
<Module 'pkg/module_py2.py'><Function 'test_only_on_python2'>
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 0x26f8f50>
+ self = <failure_demo.TestFailing object at 0x1d5e7d0>
def test_simple(self):
def f():
@@ -40,13 +40,13 @@
> assert f() == g()
E assert 42 == 43
- E + where 42 = <function f at 0x269d5f0>()
- E + and 43 = <function g at 0x269d6e0>()
+ E + where 42 = <function f at 0x1cfcb90>()
+ E + and 43 = <function g at 0x1cfcc08>()
failure_demo.py:28: AssertionError
____________________ TestFailing.test_simple_multiline
_____________________
- self = <failure_demo.TestFailing object at 0x26ade90>
+ self = <failure_demo.TestFailing object at 0x1d0fed0>
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 0x26aac10>
+ self = <failure_demo.TestFailing object at 0x1d4bc10>
def test_not(self):
def f():
return 42
> assert not f()
E assert not 42
- E + where 42 = <function f at 0x269d8c0>()
+ E + where 42 = <function f at 0x1d071b8>()
failure_demo.py:38: AssertionError
_________________ TestSpecialisedExplanations.test_eq_text
_________________
- self = <failure_demo.TestSpecialisedExplanations object at 0x2861490>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0bed0>
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 0x26ade10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0de10>
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 0x26f8ad0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d5e110>
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 0x26aa450>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1ec06d0>
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 0x26ad7d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0d950>
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 0x26f8550>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d61c50>
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 0x26aa310>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d4be10>
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 0x26a6950>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1ec0ad0>
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 0x26e4210>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0bbd0>
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 0x26f9c10>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d4bd10>
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 0x26aac50>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1ec0650>
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 0x26a6b90>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0bad0>
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 0x26f9d90>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d0d410>
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 0x26f89d0>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1ec0610>
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 0x26ad310>
+ self = <failure_demo.TestSpecialisedExplanations object at 0x1d5ed50>
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 0x26e4650>.b
+ E + where 1 = <failure_demo.Foo object at 0x1d0da50>.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 0x26f8c50>.b
- E + where <failure_demo.Foo object at 0x26f8c50> = <class
'failure_demo.Foo'>()
+ E + where 1 = <failure_demo.Foo object at 0x1d0b8d0>.b
+ E + where <failure_demo.Foo object at 0x1d0b8d0> = <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 0x26a65d0>
+ self = <failure_demo.Foo object at 0x1d5eb90>
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 0x26ad050>.b
- E + where <failure_demo.Foo object at 0x26ad050> = <class
'failure_demo.Foo'>()
- E + and 2 = <failure_demo.Bar object at 0x26ad850>.b
- E + where <failure_demo.Bar object at 0x26ad850> = <class
'failure_demo.Bar'>()
+ E + where 1 = <failure_demo.Foo object at 0x1d15c10>.b
+ E + where <failure_demo.Foo object at 0x1d15c10> = <class
'failure_demo.Foo'>()
+ E + and 2 = <failure_demo.Bar object at 0x1d15290>.b
+ E + where <failure_demo.Bar object at 0x1d15290> = <class
'failure_demo.Bar'>()
failure_demo.py:124: AssertionError
__________________________ TestRaises.test_raises
__________________________
- self = <failure_demo.TestRaises instance at 0x2859e18>
+ self = <failure_demo.TestRaises instance at 0x1ee2248>
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:905>:1:
ValueError
+ <0-codegen
/home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:976>:1:
ValueError
______________________ TestRaises.test_raises_doesnt
_______________________
- self = <failure_demo.TestRaises instance at 0x27013b0>
+ self = <failure_demo.TestRaises instance at 0x1d14b48>
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 0x271d9e0>
+ self = <failure_demo.TestRaises instance at 0x1ed9cb0>
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 0x270b3f8>
+ self = <failure_demo.TestRaises instance at 0x1eeb200>
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 0x26ab368>
+ self = <failure_demo.TestRaises instance at 0x1eebdd0>
def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
l = [1,2,3]
@@ -398,7 +398,7 @@
l is [1, 2, 3]
________________________ TestRaises.test_some_error
________________________
- self = <failure_demo.TestRaises instance at 0x271b488>
+ self = <failure_demo.TestRaises instance at 0x1edf758>
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 0x271da28>
+ self = <failure_demo.TestMoreErrors instance at 0x1ed0128>
def test_complex_error(self):
def f():
@@ -455,7 +455,7 @@
failure_demo.py:5: AssertionError
___________________ TestMoreErrors.test_z1_unpack_error
____________________
- self = <failure_demo.TestMoreErrors instance at 0x2716950>
+ self = <failure_demo.TestMoreErrors instance at 0x1ec7f38>
def test_z1_unpack_error(self):
l = []
@@ -465,7 +465,7 @@
failure_demo.py:179: ValueError
____________________ TestMoreErrors.test_z2_type_error
_____________________
- self = <failure_demo.TestMoreErrors instance at 0x26f5e18>
+ self = <failure_demo.TestMoreErrors instance at 0x1ee47a0>
def test_z2_type_error(self):
l = 3
@@ -475,19 +475,19 @@
failure_demo.py:183: TypeError
______________________ TestMoreErrors.test_startswith
______________________
- self = <failure_demo.TestMoreErrors instance at 0x27075f0>
+ self = <failure_demo.TestMoreErrors instance at 0x1eea2d8>
def test_startswith(self):
s = "123"
g = "456"
> assert s.startswith(g)
- E assert <built-in method startswith of str object at
0x26ff8c8>('456')
- E + where <built-in method startswith of str object at 0x26ff8c8>
= '123'.startswith
+ E assert <built-in method startswith of str object at
0x1d63a58>('456')
+ E + where <built-in method startswith of str object at 0x1d63a58>
= '123'.startswith
failure_demo.py:188: AssertionError
__________________ TestMoreErrors.test_startswith_nested
___________________
- self = <failure_demo.TestMoreErrors instance at 0x2707ef0>
+ self = <failure_demo.TestMoreErrors instance at 0x1ef08c0>
def test_startswith_nested(self):
def f():
@@ -495,15 +495,15 @@
def g():
return "456"
> assert f().startswith(g())
- E assert <built-in method startswith of str object at
0x26ff8c8>('456')
- E + where <built-in method startswith of str object at 0x26ff8c8>
= '123'.startswith
- E + where '123' = <function f at 0x269d7d0>()
- E + and '456' = <function g at 0x2698ed8>()
+ E assert <built-in method startswith of str object at
0x1d63a58>('456')
+ E + where <built-in method startswith of str object at 0x1d63a58>
= '123'.startswith
+ E + where '123' = <function f at 0x1d07500>()
+ E + and '456' = <function g at 0x1cf2b18>()
failure_demo.py:195: AssertionError
_____________________ TestMoreErrors.test_global_func
______________________
- self = <failure_demo.TestMoreErrors instance at 0x271bef0>
+ self = <failure_demo.TestMoreErrors instance at 0x1ed4a70>
def test_global_func(self):
> assert isinstance(globf(42), float)
@@ -513,18 +513,18 @@
failure_demo.py:198: AssertionError
_______________________ TestMoreErrors.test_instance
_______________________
- self = <failure_demo.TestMoreErrors instance at 0x271bb90>
+ self = <failure_demo.TestMoreErrors instance at 0x1edf998>
def test_instance(self):
self.x = 6*7
> assert self.x != 42
E assert 42 != 42
- E + where 42 = <failure_demo.TestMoreErrors instance at
0x271bb90>.x
+ E + where 42 = <failure_demo.TestMoreErrors instance at
0x1edf998>.x
failure_demo.py:202: AssertionError
_______________________ TestMoreErrors.test_compare
________________________
- self = <failure_demo.TestMoreErrors instance at 0x2634170>
+ self = <failure_demo.TestMoreErrors instance at 0x1edf3f8>
def test_compare(self):
> assert globf(10) < 5
@@ -534,7 +534,7 @@
failure_demo.py:205: AssertionError
_____________________ TestMoreErrors.test_try_finally
______________________
- self = <failure_demo.TestMoreErrors instance at 0x2717f80>
+ self = <failure_demo.TestMoreErrors instance at 0x1ef15f0>
def test_try_finally(self):
x = 1
@@ -543,4 +543,4 @@
E assert 1 == 0
failure_demo.py:210: AssertionError
- ======================== 39 failed in 0.26 seconds
=========================
+ ======================== 39 failed in 0.23 seconds
=========================
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 doc/en/example/simple.txt
--- a/doc/en/example/simple.txt
+++ b/doc/en/example/simple.txt
@@ -108,7 +108,7 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_module.py .s
========================= short test summary info
==========================
- SKIP [1] /tmp/doc-exec-603/conftest.py:9: need --runslow option to run
+ SKIP [1] /tmp/doc-exec-67/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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_module.py ..
@@ -256,7 +256,7 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 3 items
test_some_are_slow.py ...
@@ -383,7 +383,7 @@
$ py.test -rx
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 4 items
test_step.py .Fx.
@@ -391,7 +391,7 @@
================================= FAILURES
=================================
____________________ TestUserHandling.test_modification
____________________
- self = <test_step.TestUserHandling instance at 0x1c6fb90>
+ self = <test_step.TestUserHandling instance at 0x192ea28>
def test_modification(self):
> assert 0
@@ -453,7 +453,7 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 7 items
test_step.py .Fx.
@@ -463,17 +463,17 @@
================================== ERRORS
==================================
_______________________ ERROR at setup of test_root
________________________
- file /tmp/doc-exec-603/b/test_error.py, line 1
+ file /tmp/doc-exec-67/b/test_error.py, line 1
def test_root(db): # no db here, will error out
fixture 'db' not found
- available fixtures: pytestconfig, recwarn, monkeypatch, capfd,
capsys, tmpdir
+ available fixtures: monkeypatch, capsys, tmpdir, capfd,
pytestconfig, recwarn
use 'py.test --fixtures [testpath]' for help on them.
- /tmp/doc-exec-603/b/test_error.py:1
+ /tmp/doc-exec-67/b/test_error.py:1
================================= FAILURES
=================================
____________________ TestUserHandling.test_modification
____________________
- self = <test_step.TestUserHandling instance at 0x22f3518>
+ self = <test_step.TestUserHandling instance at 0x2099a28>
def test_modification(self):
> assert 0
@@ -482,20 +482,20 @@
test_step.py:9: AssertionError
_________________________________ test_a1
__________________________________
- db = <conftest.DB instance at 0x2304248>
+ db = <conftest.DB instance at 0x20a1518>
def test_a1(db):
> assert 0, db # to show value
- E AssertionError: <conftest.DB instance at 0x2304248>
+ E AssertionError: <conftest.DB instance at 0x20a1518>
a/test_db.py:2: AssertionError
_________________________________ test_a2
__________________________________
- db = <conftest.DB instance at 0x2304248>
+ db = <conftest.DB instance at 0x20a1518>
def test_a2(db):
> assert 0, db # to show value
- E AssertionError: <conftest.DB instance at 0x2304248>
+ E AssertionError: <conftest.DB instance at 0x20a1518>
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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_module.py FF
@@ -561,7 +561,7 @@
================================= FAILURES
=================================
________________________________ test_fail1
________________________________
- tmpdir = local('/tmp/pytest-190/test_fail10')
+ tmpdir = local('/tmp/pytest-281/test_fail10')
def test_fail1(tmpdir):
> assert 0
@@ -575,12 +575,12 @@
E assert 0
test_module.py:4: AssertionError
- ========================= 2 failed in 0.01 seconds
=========================
+ ========================= 2 failed in 0.02 seconds
=========================
you will have a "failures" file which contains the failing test ids::
$ cat failures
- test_module.py::test_fail1 (/tmp/pytest-190/test_fail10)
+ test_module.py::test_fail1 (/tmp/pytest-281/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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 3 items
test_module.py Esetting up a test failed! test_module.py::test_setup_fails
@@ -676,7 +676,7 @@
E assert 0
test_module.py:15: AssertionError
- ==================== 2 failed, 1 error in 0.02 seconds
=====================
+ ==================== 2 failed, 1 error in 0.01 seconds
=====================
You'll see that the fixture finalizers could use the precise reporting
information.
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_smtpsimple.py F
@@ -84,7 +84,7 @@
================================= FAILURES
=================================
________________________________ test_ehlo
_________________________________
- smtp = <smtplib.SMTP instance at 0x2bb9d88>
+ smtp = <smtplib.SMTP instance at 0x24a9950>
def test_ehlo(smtp):
response, msg = smtp.ehlo()
@@ -94,7 +94,7 @@
E assert 0
test_smtpsimple.py:12: AssertionError
- ========================= 1 failed in 0.18 seconds
=========================
+ ========================= 1 failed in 0.21 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 2 items
test_module.py FF
@@ -202,7 +202,7 @@
================================= FAILURES
=================================
________________________________ test_ehlo
_________________________________
- smtp = <smtplib.SMTP instance at 0x18f2fc8>
+ smtp = <smtplib.SMTP instance at 0x138a290>
def test_ehlo(smtp):
response = smtp.ehlo()
@@ -214,7 +214,7 @@
test_module.py:6: AssertionError
________________________________ test_noop
_________________________________
- smtp = <smtplib.SMTP instance at 0x18f2fc8>
+ smtp = <smtplib.SMTP instance at 0x138a290>
def test_noop(smtp):
response = smtp.noop()
@@ -223,7 +223,7 @@
E assert 0
test_module.py:11: AssertionError
- ========================= 2 failed in 0.16 seconds
=========================
+ ========================= 2 failed in 0.19 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.15 seconds
+ 2 failed in 0.24 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.16 seconds
+ 2 failed in 0.23 seconds
Let's quickly create another test module that actually sets the
server URL in its module namespace::
@@ -379,7 +379,7 @@
================================= FAILURES
=================================
__________________________ test_ehlo[merlinux.eu]
__________________________
- smtp = <smtplib.SMTP instance at 0x2662290>
+ smtp = <smtplib.SMTP instance at 0x15f7998>
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 0x2662290>
+ smtp = <smtplib.SMTP instance at 0x15f7998>
def test_noop(smtp):
response = smtp.noop()
@@ -402,7 +402,7 @@
test_module.py:11: AssertionError
________________________ test_ehlo[mail.python.org]
________________________
- smtp = <smtplib.SMTP instance at 0x26c2dd0>
+ smtp = <smtplib.SMTP instance at 0x16535f0>
def test_ehlo(smtp):
response = smtp.ehlo()
@@ -411,9 +411,11 @@
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 0x15f7998>
________________________ test_noop[mail.python.org]
________________________
- smtp = <smtplib.SMTP instance at 0x26c2dd0>
+ smtp = <smtplib.SMTP instance at 0x16535f0>
def test_noop(smtp):
response = smtp.noop()
@@ -422,7 +424,7 @@
E assert 0
test_module.py:11: AssertionError
- 4 failed in 6.32 seconds
+ 4 failed in 6.30 seconds
We see that our two test functions each ran twice, against the different
``smtp`` instances. Note also, that with the ``mail.python.org``
@@ -462,13 +464,13 @@
$ py.test -v test_appsetup.py
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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:12: test_smtp_exists[merlinux.eu] PASSED
- ========================= 2 passed in 5.75 seconds
=========================
+ ========================= 2 passed in 5.63 seconds
=========================
Due to the parametrization of ``smtp`` the test will run twice with two
different ``App`` instances and respective smtp servers. There is no
@@ -526,7 +528,7 @@
$ py.test -v -s test_module.py
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2 --
/home/hpk/p/pytest/.tox/regen/bin/python
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0 --
/home/hpk/p/pytest/.tox/regen/bin/python
collecting ... collected 8 items
test_module.py:15: test_0[1] test0 1
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 py.test version 2.4.2, imported from
/home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/pytest.pyc
+ This is py.test version 2.5.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`.
@@ -45,7 +45,7 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_sample.py F
@@ -123,7 +123,7 @@
================================= FAILURES
=================================
____________________________ TestClass.test_two
____________________________
- self = <test_class.TestClass instance at 0x1e1f518>
+ self = <test_class.TestClass instance at 0x2a8fef0>
def test_two(self):
x = "hello"
@@ -159,7 +159,7 @@
================================= FAILURES
=================================
_____________________________ test_needsfiles
______________________________
- tmpdir = local('/tmp/pytest-186/test_needsfiles0')
+ tmpdir = local('/tmp/pytest-277/test_needsfiles0')
def test_needsfiles(tmpdir):
print tmpdir
@@ -168,7 +168,7 @@
test_tmpdir.py:3: AssertionError
----------------------------- Captured stdout
------------------------------
- /tmp/pytest-186/test_needsfiles0
+ /tmp/pytest-277/test_needsfiles0
1 failed in 0.01 seconds
Before the test runs, a unique-per-test-invocation temporary directory
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 doc/en/parametrize.txt
--- a/doc/en/parametrize.txt
+++ b/doc/en/parametrize.txt
@@ -53,8 +53,7 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.3.dev1
- plugins: xdist, cov, pep8, xprocess, capturelog, cache, flakes, instafail
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 3 items
test_expectation.py ..F
@@ -75,7 +74,7 @@
E + where 54 = eval('6*9')
test_expectation.py:8: AssertionError
- ==================== 1 failed, 2 passed in 0.04 seconds
====================
+ ==================== 1 failed, 2 passed in 0.01 seconds
====================
As designed in this example, only one pair of input/output values fails
the simple test function. And as usual with test function arguments,
@@ -101,13 +100,12 @@
$ py.test
=========================== test session starts
============================
- platform linux2 -- Python 2.7.3 -- pytest-2.4.3.dev1
- plugins: xdist, cov, pep8, xprocess, capturelog, cache, flakes, instafail
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 3 items
test_expectation.py ..x
- =================== 2 passed, 1 xfailed in 0.02 seconds
====================
+ =================== 2 passed, 1 xfailed in 0.01 seconds
====================
The one parameter set which caused a failure previously now
shows up as an "xfailed (expected to fail)" test.
@@ -172,8 +170,8 @@
def test_valid_string(stringinput):
> assert stringinput.isalpha()
- E assert <built-in method isalpha of str object at 0x7f36a91ea1c0>()
- E + where <built-in method isalpha of str object at
0x7f36a91ea1c0> = '!'.isalpha
+ E assert <built-in method isalpha of str object at 0x2b4b17865198>()
+ E + where <built-in method isalpha of str object at
0x2b4b17865198> = '!'.isalpha
test_strings.py:3: AssertionError
1 failed in 0.01 seconds
@@ -187,7 +185,7 @@
$ py.test -q -rs test_strings.py
s
========================= short test summary info
==========================
- SKIP [1] /home/hpk/p/pytest/_pytest/python.py:1019: got empty parameter
set, function test_valid_string at /tmp/doc-exec-686/test_strings.py:1
+ SKIP [1]
/home/hpk/p/pytest/.tox/regen/local/lib/python2.7/site-packages/_pytest/python.py:1087:
got empty parameter set, function test_valid_string at
/tmp/doc-exec-24/test_strings.py:1
1 skipped in 0.01 seconds
For further examples, you might want to look at :ref:`more
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 6 items
xfail_demo.py xxxxxx
@@ -176,7 +176,7 @@
XFAIL xfail_demo.py::test_hello6
reason: reason
- ======================== 6 xfailed in 0.05 seconds
=========================
+ ======================== 6 xfailed in 0.06 seconds
=========================
.. _`skip/xfail with parametrize`:
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.0
collected 1 items
test_tmpdir.py F
@@ -37,7 +37,7 @@
================================= FAILURES
=================================
_____________________________ test_create_file
_____________________________
- tmpdir = local('/tmp/pytest-187/test_create_file0')
+ tmpdir = local('/tmp/pytest-278/test_create_file0')
def test_create_file(tmpdir):
p = tmpdir.mkdir("sub").join("hello.txt")
@@ -48,7 +48,7 @@
E assert 0
test_tmpdir.py:7: AssertionError
- ========================= 1 failed in 0.01 seconds
=========================
+ ========================= 1 failed in 0.02 seconds
=========================
.. _`base temporary directory`:
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 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 -- pytest-2.4.2
+ platform linux2 -- Python 2.7.3 -- pytest-2.5.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 0x27b2b00>
+ E AssertionError: <conftest.DummyDB instance at 0x101b3b0>
test_unittest_db.py:9: AssertionError
___________________________ MyTest.test_method2
____________________________
@@ -110,7 +110,7 @@
def test_method2(self):
> assert 0, self.db # fail for demo purposes
- E AssertionError: <conftest.DummyDB instance at 0x27b2b00>
+ E AssertionError: <conftest.DummyDB instance at 0x101b3b0>
test_unittest_db.py:12: AssertionError
========================= 2 failed in 0.02 seconds
=========================
diff -r 5105a08e9aa24fafd7898e85b06295636d12367c -r
1cc371f915168249b0db38d2c3e2b95453f7c9c3 setup.py
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
name='pytest',
description='py.test: simple powerful testing with Python',
long_description = long_description,
- version='2.5.0.dev1',
+ version='2.5.0',
url='http://pytest.org',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
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.
_______________________________________________
pytest-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pytest-commit
