3e875178ad
Merge default
2014-08-01 23:06:24 +01:00
97b671057d
put some imports back to function-level and streamline py2/py3 compat in one place
2014-08-01 10:12:53 +02:00
d6fc489b2b
Backed out changeset e57017ad86ce -- logging should not be imported
2014-08-01 08:13:44 +02:00
4e8438afc8
Simply show the node ID for verbose output
...
This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test. This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line.
2014-08-01 00:29:35 +01:00
b1f8038abf
Minor fixed in test_capture
...
This test failed only in py34. We don't import logging directly,
but it seems that one of the standard modules that are now
globally imported started including this on py34.
Just removed the assert as it doesn't seem central to the
test's objective.
2014-07-31 19:52:08 -03:00
5603a0cd4b
Removing py.std usage from _pytest
2014-07-31 19:13:40 -03:00
bcdc3d0154
reorder talks, more talks from pelme and others
2014-07-29 15:06:37 +02:00
faea7e1407
add flub and pelme talks at EuroPython2014, remove one past training note
2014-07-29 15:00:45 +02:00
7c701948d5
Merged in nicoddemus/pytest/cx_freeze-docs (pull request #188 )
...
Documentation example on how to integrate pytest and cx_freeze
2014-07-29 12:43:04 +02:00
899b804ec1
Improved the text a little
...
--HG--
branch : cx_freeze-docs
2014-07-28 22:46:57 -03:00
66bd4e485a
Adding blurb about using pytest runner and cx_freeze
...
--HG--
branch : cx_freeze-docs
2014-07-28 22:40:23 -03:00
8ff8dd3ae9
Merged in fix_initial_parsing (pull request #186 )
...
Fix issue544 and fix another issue with parsing ``::``
2014-07-28 14:16:02 +02:00
0d17dc1e19
add a comment for why we only consider .py files when removing @
...
--HG--
branch : fix_initial_parsing
2014-07-28 13:56:10 +02:00
83e0b52294
speedup @ replacement for the massive lists from pytest-bdd :)
...
--HG--
branch : fix_initial_parsing
2014-07-28 13:53:53 +02:00
1265612465
fix issue547 2.6 regression: capsys/capfd now work again when output capturing ("-s") is disabled.
2014-07-28 13:17:37 +02:00
40eed363e8
fix issue544 by only removing "@NUM" at the end of a part (parts are
...
separated by "::") and if the part has an .py extension.
--HG--
branch : fix_initial_parsing
2014-07-28 12:07:15 +02:00
5ccd3f2fc5
fix conftest detection if commandline arguments contain "::" syntax
...
--HG--
branch : fix_initial_parsing
2014-07-28 11:48:37 +02:00
ba878c6d9d
add changelog entry and refactor unittest.mock.patch fix a bit
2014-07-28 10:34:01 +02:00
8792261df1
Merged in ticosax/pytest/mock-unittest-252 (pull request #184 )
...
Injection of fixture doesn't work when decorated with unittest.mock.patch
2014-07-28 10:31:31 +02:00
c2ed29070a
address issue170 by merging David Mohr's PR on adding "raises" as an optional
...
argument to pytest.mark.xfail.
2014-07-28 09:59:22 +02:00
38104dfc92
Merged in squisher/pytest/xfail-cause (pull request #183 )
...
Add mark.xfail argument raises so that unexpected exceptions show up as test failures.
2014-07-28 09:55:02 +02:00
2e55c4ba61
unittest.mock from stdlib should come last
...
--HG--
branch : mock-unittest-252
2014-07-27 12:11:39 +02:00
e6ad6e02d2
Handle also unittest.mock
...
Move handling in dedicated function to isolate its logic
--HG--
branch : mock-unittest-252
2014-07-27 10:43:50 +02:00
d08c4ce0ad
Tiny example update for clarification
...
--HG--
branch : xfail-cause
2014-07-26 18:24:55 +02:00
309e3d38a0
Directly pass multiple parameters with mark.parametrize()
...
--HG--
branch : xfail-cause
2014-07-26 18:19:27 +02:00
91e2b23258
Update documentation
...
--HG--
branch : xfail-cause
2014-07-26 18:10:32 +02:00
6a4492a22d
isinstance() on exception value instead of comparing types, consolidate tests
...
--HG--
branch : xfail-cause
2014-07-26 17:46:50 +02:00
0dd378da30
Injection of fixture doesn't work when decorated with unittest.mock.patch
...
This is a continuation of #182
--HG--
branch : mock-unittest-252
2014-07-26 17:26:18 +02:00
7b273b8577
Add mark.xfail argument raises so that unexpected exceptions show up as test failures.
...
--HG--
branch : xfail-cause
2014-07-26 15:11:05 +02:00
d98521b0d9
Added tag 2.6.0 for changeset 88af949b9611
2014-07-20 13:15:44 +02:00
52011e84d3
merge
2014-07-20 13:15:21 +02:00
de583ed7a3
some notes about upcoming trainings
2014-07-20 13:07:38 +02:00
f8480caae4
Added tag 2.6.0 for changeset 60725b17a9d1
2014-07-20 13:03:11 +02:00
47d9e6ca1f
fix release announce
2014-07-20 11:07:18 +02:00
6f0a33dfdc
Updating plugins_index
2014-07-18 21:10:50 -03:00
1641d00cb1
Merge default
2014-07-18 01:34:08 +01:00
2d7a32f7ea
Add test case for using different modules
2014-07-18 01:30:29 +01:00
06acbb9f5e
bump doc version
2014-07-17 17:22:44 +02:00
7b630d9080
mention next open trainings at EP2014 and in Freiburg in November 2014
2014-07-17 17:21:45 +02:00
98de64badc
regen docs for pytest-2.6
2014-07-17 16:55:24 +02:00
1e241e1f2a
mention py34 compatibility
2014-07-17 16:49:10 +02:00
ff2c18fedb
bump version, preliminary announcement
2014-07-17 16:38:54 +02:00
bf64a800d6
pytest depends on the freshly released 1.4.22 to function properly
2014-07-17 10:55:52 +02:00
efc57391eb
remove extra parentheses - stylistic code change
2014-07-17 08:35:36 +02:00
dc65aa1fea
avoid importing old assertion interpretation code by default ( fixes #537 )
2014-07-16 17:21:18 -07:00
80ad3fb8ed
Merged in wooparadog/pytest (pull request #163 )
...
Also replace `report.longrepr` with `bin_xml_escape`ed skipreason
2014-07-15 22:17:15 +02:00
bc7110931a
Merged in alex_gaynor/pytest/alex_gaynor/marked-pytest-as-being-a-universal-wheel-1405267754279 (pull request #179 )
...
Marked pytest as being a universal wheel.
2014-07-15 11:26:08 +02:00
8c508612ec
with pypy this tests leaks one FD but it's probably a residual effect of the testing machinery and Pypy's lazy GC.
2014-07-14 09:17:04 +02:00
b7d046527e
Marked pytest as being a universal wheel.
...
--HG--
branch : alex_gaynor/marked-pytest-as-being-a-universal-wheel-1405267754279
2014-07-13 16:09:24 +00:00
42804c52e8
Merged in bmcorser/pytest-1/bmcorser/scratching-an-itch-love-pytest-1404943207227 (pull request #178 )
...
Scratching an itch. Love py.test!
2014-07-10 09:00:24 +02:00
Floris Bruynooghe
holger krekel
Bruno Oliveira
Anatoly Bubenkov
Nicolas Delaby
david@mcbf.net
Jurko Gospodnetić
Benjamin Peterson
Alex Gaynor