floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,809 Commits 32 Branches 205 Tags
bc1f8666aaee6458da9584ecf7ef3cb956b94e47
Commit Graph

1664 Commits

Author SHA1 Message Date
Bruno Oliveira
d81ee9acfb Merge pull request #1597 from taschini/pyargs-fix 
Ensure that a module within a namespace package can be found by --pyargs
 2016-06-19 14:20:52 -03:00
Bruno Oliveira
72bf11cbe9 Add disabled() method to capsys and capfd 
Fix #1599
 2016-06-19 19:14:36 +02:00
palaviv
d21886c005 pytest.raises accpets custom message 2016-06-16 20:15:32 +03:00
Greg Price
ab8b2e75a3 Simplify default pytest_runtestloop 
The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.

Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler.
 2016-06-15 18:27:08 -07:00
Bruno Oliveira
308396ae3c Merge pull request #1606 from hackebrot/show-fixtures-per-test 
Show fixtures per test
 2016-06-14 09:54:18 -03:00
taschini
4d9e293b4d Incorporated feedback (#1597). 
Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected.
 2016-06-14 07:12:40 +02:00
taschini
e2e6e31711 Ensure that a module within a namespace package can be found by --pyargs. 2016-06-14 07:12:40 +02:00
Raphael Pierzina
adc50ac72f Change format for test function locations 2016-06-12 15:58:32 +01:00
Guyzmo
accd962c9f Fixed issue shadowing error when missing argument on teardown_method 
When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.

This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.

* fixes issue #1604

Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
 2016-06-12 03:45:24 +02:00
Raphael Pierzina
b99aace8a9 Fix py26 by using indices in str.format 2016-06-12 00:52:03 +01:00
Raphael Pierzina
7eea168106 Implement show_fixtures_per_test and add cli flag 2016-06-12 00:20:06 +01:00
Bruno Oliveira
bdc29968b8 Remove dead code and simplify code in call_fixture_func 2016-06-08 21:07:56 -03:00
Bruno Oliveira
98acda426f Remove yieldctx variable being passed around 2016-06-08 21:07:50 -03:00
Bruno Oliveira
d712428d33 Fix custom name for yield_fixtures 2016-06-08 21:07:49 -03:00
Bruno Oliveira
366879db27 Make normal fixtures work with "yield" 2016-06-08 21:07:47 -03:00
marscher
09d163aa3a [exception handling] Fix case the current working directory (CWD) gets deleted during testing. 
Fixes #1235.
 2016-06-08 15:18:23 +02:00
Thomas Grainger
74862b8f2f Don't mark empty doctest files as skipped, fixes #1578 2016-06-01 19:19:14 +01:00
Ronny Pfannschmidt
fad6266a47 finish up the version bump in __init__ i forgot 2016-06-01 08:18:10 +02:00
Ronny Pfannschmidt
b5bd4d959d merge master to features 2016-06-01 08:13:26 +02:00
Ronny Pfannschmidt
85541113eb update version 2016-05-31 19:05:36 +02:00
Raphael Pierzina
0d80a9c729 Change _showfixtures_main to loop over fixturedefs 2016-05-31 11:47:16 +01:00
Ronny Pfannschmidt
158f3cfaea merge master 2016-05-31 11:24:53 +02:00
Ronny Pfannschmidt
afc5c7e4f6 better message for empty argument skip 
include the argument names to help determining the fixture/parametrization
 2016-05-30 14:42:55 +02:00
Ronny Pfannschmidt
03eb9203fd remove the old empty argument triggers 
unlike the marker based one its not composable
 2016-05-30 14:41:00 +02:00
Ronny Pfannschmidt
d217b52508 fix #510 by adding a describing skip marker on empty parameterize 2016-05-30 14:34:38 +02:00
Bruno Oliveira
8c1be624a6 Merge pull request #1554 from RonnyPfannschmidt/merge-master 
Merge master into features
 2016-05-24 11:09:33 -03:00
Ronny Pfannschmidt
16794feaf6 Merge branch 'master' into merge-master 2016-05-24 08:15:10 +02:00
Bruno Oliveira
9fb5ddf778 Fix shell argument split in win32 
This fixes the bug inserted by accident in #1523
 2016-05-23 20:41:47 -03:00
Bruno Oliveira
5ab5a11544 Merge pull request #1565 from tomviner/issue1544/ignore-build-dist-dirs 
Issue 1544: norecursedirs build & dist dirs
 2016-05-23 19:30:20 -03:00
TomV
d6dfb1a393 issue 1544: norecursedirs build & dist dirs 2016-05-23 21:02:29 +01:00
AbdealiJK
d4c9fa9f1a unittest.UnitTestCase: Allow __test__ for methods 
__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.

Fixes https://github.com/pytest-dev/pytest/issues/1558
 2016-05-19 08:19:57 +05:30
Ronny Pfannschmidt
eab762ea99 Merge branch 'master' into merge-master 2016-05-13 19:37:41 +02:00
Ronny Pfannschmidt
c49863aa63 merge next chunk from master and fix changelog linting issue 2016-05-13 19:36:47 +02:00
Ronny Pfannschmidt
01d2ff804b Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master 2016-05-13 17:55:02 +02:00
John Towler
0d07b64571 Fixes Issue 1549 2016-05-05 11:29:05 -07:00
Benjamin Dopplinger
75abfbe8d4 Fix typo in doc 2016-04-28 14:40:17 +10:00
Ronny Pfannschmidt
6cc56b4a1b Merge pull request #1535 from palaviv/parametrize-test-ids-hook 
introduce pytest_make_parametrize_id hook
 2016-04-27 16:16:16 +02:00
palaviv
9733127951 pytest_make_parametrize_id receive config object 2016-04-26 10:23:57 +03:00
Bruno Oliveira
fdee88f086 Merge pull request #1520 from omarkohl/invalid_test_module_name 
Raise CollectError if import test module fails
 2016-04-25 21:42:41 -03:00
palaviv
53429ed8b8 Added hook to plugin docs and new CHANGELOG record 2016-04-25 18:03:34 +03:00
palaviv
b9faf78d51 Added test_pytest_make_parametrize_id 2016-04-25 17:48:28 +03:00
palaviv
79927428d1 Added pytest_make_parametrize_id hook 2016-04-25 17:11:47 +03:00
Omar Kohl
56855893ca Raise CollectError if import test module fails 
One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.

fix #1426
 2016-04-23 13:50:48 +02:00
Ronny Pfannschmidt
6d661ace0a Merge pull request #1523 from MengJueM/master 2016-04-20 16:55:31 +02:00
Florian Bruhin
aa87395c39 Use py.builtin.callable 
This restores compatibility with Python 3.0/3.1
 2016-04-20 11:18:47 +02:00
Florian Bruhin
75160547f2 Use a callable __tracebackhide__ for filtering 
While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible.
 2016-04-20 11:09:27 +02:00
Florian Bruhin
b607f6728f Filter selectively with __tracebackhide__ 
When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens.
 2016-04-20 10:25:33 +02:00
Florian Bruhin
c24e8e01b4 Fix TracebackItem documentation in pytest.code 
The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry.
 2016-04-20 08:35:17 +02:00
MengJueM
1a37035d71 Add test test_absolute_win32_path 2016-04-20 01:27:37 +08:00
TomV
99c4b6fdc3 issue 1496 - xfail with condition keyword 2016-04-19 18:12:37 +01:00