Commit Graph

10403 Commits

Author SHA1 Message Date
Thomas Grainger 013d0e66c7
use safe_str to serialize Exceptions Fixes #5478 2019-06-26 11:11:54 +01:00
Bruno Oliveira 554bff8cc1
Merge pull request #5489 from graingert/fix-safe-str-doc
fix safe_str docstring
2019-06-25 17:30:54 -03:00
Thomas Grainger d2f74d342e
fix safe_str docstring 2019-06-25 12:54:46 +01:00
Bruno Oliveira 430de12f35
Merge pull request #5486 from nicoddemus/backport-5483
[4.6] Pickup addition positional args passed to _parse_parametrize_ar… (#5483)
2019-06-24 22:59:54 -03:00
Bruno Oliveira d5eed3bb9c Pickup addition positional args passed to _parse_parametrize_ar… (#5483)
Pickup addition positional args passed to _parse_parametrize_args
2019-06-24 22:07:53 -03:00
Bruno Oliveira 4b104ba222
Merge pull request #5454 from nicoddemus/backport-5446
Backport 5446
2019-06-17 09:46:01 -03:00
Zac Hatfield-Dodds c765b83a2a
Merge pull request #5453 from Zac-HD/backport-unwrapper
[4.6] Backport unwrapper PR
2019-06-17 15:40:40 +10:00
Daniel Hahler 443af11861 Merge pull request #5404 from Zac-HD/helpful-mock-unwrapper
Emit warning for broken object
2019-06-17 14:48:40 +10:00
Bruno Oliveira 4e02248b84 Fix test docstring 2019-06-16 10:46:07 -03:00
Bruno Oliveira 43a499e6fa Remove handling of collection errors by --sw
Since then pytest itself adopted the behavior of interrupting
the test session on collection errors, so --sw no longer needs
to handle this.

The --sw behavior seems have been implemented when pytest
would continue execution even if there were collection errors.
2019-06-16 10:46:07 -03:00
Bruno Oliveira e2fa2b621c Fix --sw crash when first file in cmdline fails to collect
Fix #5444
2019-06-16 10:46:07 -03:00
Thomas Grainger 0fc11b6f3c add test for stepwise attribute error Refs: #5444 2019-06-16 10:46:07 -03:00
Anthony Sottile d2c1a04532
Merge pull request #5435 from asottile/release-4.6.3
Preparing release version 4.6.3
2019-06-11 09:58:51 -07:00
Anthony Sottile b8e65d03bf Preparing release version 4.6.3 2019-06-11 08:48:11 -07:00
Anthony Sottile f37ea715d8
Merge pull request #5425 from asottile/backport-5421
[4.6] Link deprecation docs pytest.raises 'message' warning
2019-06-08 15:05:01 -07:00
Anthony Sottile 45d36ddb47 Merge pull request #5421 from nicoddemus/raises-warning-message
Link deprecation docs pytest.raises 'message' warning
2019-06-08 12:45:16 -07:00
Anthony Sottile 355954df5d
Merge pull request #5411 from nicoddemus/backport-5391
[4.6] Fix verbosity bug in --collect-only (backport of #5391)
2019-06-05 17:32:15 -07:00
Bruno Oliveira a93c50ccb9 Fix verbosity bug in --collect-only (#5391)
Fix verbosity bug in --collect-only
2019-06-05 20:50:21 -03:00
Bruno Oliveira 1cae76b0fe
[4.6] tests: restore tracing function (#5408)
[4.6] tests: restore tracing function
2019-06-05 20:01:55 -03:00
Daniel Hahler 1b7597ac91 [4.6] tests: restore tracing function
Without this, `testing/test_pdb.py` (already without pexpect) will cause
missing test coverage afterwards (for the same process).
2019-06-05 12:44:30 +02:00
Anthony Sottile 21680ffa77
Merge pull request #5401 from nicoddemus/backport-5389
[4.6] Backport #5389
2019-06-04 19:35:42 -07:00
Bruno Oliveira 8076f48eae
[4.6] Merge pull request #5393 from nicoddemus/unittest-self-5390 (#5399)
[4.6] Merge pull request #5393 from nicoddemus/unittest-self-5390
2019-06-04 22:56:09 -03:00
Dirk Thomas 0ae27714d1 Backport of #5389: fix for 'files' = None in broken metadata 2019-06-04 22:21:25 -03:00
Anthony Sottile 92432ac45c Merge pull request #5393 from nicoddemus/unittest-self-5390
item.obj is again a bound method on TestCase function items
2019-06-04 17:49:53 -07:00
Anthony Sottile 937f945946
Merge pull request #5386 from asottile/backport_5384
[4.6] Remove --recreate from .travis.yml (#5384)
2019-06-03 19:54:30 -07:00
Bruno Oliveira 829a5986e8 Remove --recreate from .travis.yml (#5384)
Remove --recreate from .travis.yml
2019-06-03 19:26:04 -07:00
Anthony Sottile 54dbfb5167
Merge pull request #5379 from asottile/release-4.6.2
Preparing release version 4.6.2
2019-06-03 12:19:07 -07:00
Anthony Sottile 70f0b77c72 Preparing release version 4.6.2 2019-06-03 10:43:09 -07:00
Anthony Sottile 2a8b463b38
Merge pull request #5376 from asottile/backport_5373
[4.6] Merge pull request #5373 from asottile/revert_all_handling
2019-06-03 10:18:37 -07:00
Anthony Sottile 12bf458719 Merge pull request #5373 from asottile/revert_all_handling
Revert unrolling of `all()`
2019-06-03 09:20:48 -07:00
Anthony Sottile 114dba56f8
Merge pull request #5362 from asottile/release-4.6.1
Preparing release version 4.6.1
2019-06-02 11:43:41 -07:00
Anthony Sottile abb853f482 Preparing release version 4.6.1 2019-06-02 10:09:51 -07:00
Anthony Sottile 8208a376cc
Merge pull request #5361 from asottile/backport_5360
[4.6] Fix all() unroll for non-generators/non-list comprehensions (#5360)
2019-06-02 10:04:31 -07:00
Bruno Oliveira f078984c2e Fix all() unroll for non-generators/non-list comprehensions (#5360)
Fix all() unroll for non-generators/non-list comprehensions
2019-06-02 09:12:39 -07:00
Bruno Oliveira dba62f8a46
[4.6] Fix `pytest.mark.parametrize` when the argvalue is an iterator (#5357)
[4.6] Fix `pytest.mark.parametrize` when the argvalue is an iterator
2019-06-01 19:58:06 -03:00
Anthony Sottile f7bf914108 Fix `pytest.mark.parametrize` when the argvalue is an iterator 2019-06-01 15:10:33 -07:00
Anthony Sottile 917195ea8e
Merge pull request #5350 from asottile/release-4.6.0
Release 4.6.0
2019-06-01 11:10:57 -07:00
Anthony Sottile e7cd00ac92 Preparing release version 4.6.0 2019-05-31 23:12:57 -07:00
Daniel Hahler 693c3b7f61
Merge pull request #5349 from asottile/mm
Merge master into features
2019-05-31 06:35:00 +02:00
Anthony Sottile fb3ae5eaa9 Merge remote-tracking branch 'origin/master' into mm 2019-05-30 20:23:38 -07:00
Bruno Oliveira c8d23c206b
logging: Improve formatting of multiline message (#5312)
logging: Improve formatting of multiline message
2019-05-30 21:42:41 -03:00
Bruno Oliveira c5de8e8c50
ci: Travis: add pypy3 to allowed failures temporarily (#5340)
ci: Travis: add pypy3 to allowed failures temporarily
2019-05-30 21:37:55 -03:00
Bruno Oliveira f360147758
Avoiding looking upwards for parameter argnames when generating fixtu… (#5254)
Avoiding looking upwards for parameter argnames when generating fixtu…
2019-05-30 21:08:15 -03:00
Victor Maryama 65bd1b8a93 Avoiding looking upwards for parameter argnames when generating fixtureinfo. 2019-05-30 23:42:04 +02:00
Daniel Hahler 882f3a4cd7
Merge pull request #5306 from blueyed/spawn-home
pytester: use temporary HOME with spawn
2019-05-30 20:46:17 +02:00
Anthony Sottile 56e430f74e
Merge pull request #5338 from nicoddemus/junit_log_passing_tests-ref-docs
Add missing junitxml ini options to the reference docs
2019-05-30 10:29:56 -07:00
Anthony Sottile 654d8da9f7
Merge pull request #5346 from nicoddemus/improve-collect-warn-message
Show test module in the PytestCollectionWarning message
2019-05-30 10:27:52 -07:00
Daniel Hahler ace3a02cd4 pytester: factor out testdir._env_run_update 2019-05-30 17:39:44 +02:00
Daniel Hahler f013a5e8c1 pytester: use temporary HOME with spawn
Followup to https://github.com/pytest-dev/pytest/issues/4956.
2019-05-30 17:39:44 +02:00
Bruno Oliveira fbd8ff9502
Merge master into features (#5339)
Merge master into features
2019-05-30 12:21:51 -03:00