Bruno Oliveira
dca77b2273
Escape whitespace only strings when diffing them on failed assertions
...
Fix #3443
2018-05-03 20:38:00 -03:00
Bruno Oliveira
35f53a7353
Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorage
...
Fix #3441 let mark expressions be populated from the modern marker storage
2018-05-03 19:27:07 -03:00
Ronny Pfannschmidt
e6a86e0f4c
add tests for #3441
2018-05-03 17:33:59 +02:00
Bruno Oliveira
b03b387861
Merge pull request #3436 from brianmaissy/feature/enter_pdb_on_keyboard_interrupt
...
--pdb treats KeyboardInterrupt as exception
2018-05-03 12:20:43 -03:00
Ronny Pfannschmidt
a5cf55dd4a
fix test_mark_option_custom - it used the legacy keyword storage for addign markers
2018-05-03 16:33:16 +02:00
Ronny Pfannschmidt
63ef46dd91
fix #3441 - use iter-marks to populate markexpr namespace
2018-05-03 16:28:47 +02:00
Ronny Pfannschmidt
7834b45002
Merge pull request #3437 from nicoddemus/mark-changelog
...
Improve changelog note about markers
2018-05-02 06:45:39 +02:00
Bruno Oliveira
ccaa979f27
Improve changelog note about markers
...
Also changed the title in the docs because the previous title had
the same level as the title, making it appear in a separate entry
in `contents.rst`
2018-05-01 19:27:53 -03:00
Bruno Oliveira
1a880be85b
Remove unused import to fix linting
2018-05-01 19:08:29 -03:00
Brian Maissy
c258fe1459
--pdb treats KeyboardInterrupt as exception
2018-05-02 00:58:35 +03:00
turturica
7d0dba18de
Removed _CompatProperty("Package")
2018-04-27 10:23:15 -07:00
Ronny Pfannschmidt
08aed1a6bf
Merge pull request #3433 from nicoddemus/conda-forge-badge
...
Use conda-forge badge instead of anaconda's
2018-04-27 16:11:58 +02:00
Bruno Oliveira
b49e9191ac
Use conda-forge badge instead of anaconda's
...
Just noticed that conda-forge has its own badge so let's use that
2018-04-27 10:23:28 -03:00
turturica
6fc7f07a80
Workaround for py36-xdist failure.
2018-04-26 23:05:03 -07:00
Bruno Oliveira
febccae037
Merge pull request #3431 from jdufresne/pypi
...
Update all pypi.python.org URLs to pypi.org
2018-04-26 13:15:46 -03:00
Jon Dufresne
d2bf0bf9bb
Update all pypi.python.org URLs to pypi.org
...
For details on the new PyPI, see the blog post:
https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
2018-04-26 06:49:33 -07:00
turturica
05b5b64379
Merge remote-tracking branch 'upstream/features' into features
2018-04-25 21:20:39 -07:00
turturica
229c8e551d
Fix parametrized fixtures reordering.
2018-04-25 18:44:54 -07:00
Ronny Pfannschmidt
5ba0663827
Merge pull request #3428 from nicoddemus/merge-master-into-features
...
Merge master into features
2018-04-25 14:04:41 +02:00
Bruno Oliveira
63368e07ea
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-24 21:26:45 -03:00
Bruno Oliveira
0b2b73c36a
Remove CHANGELOG entries left by old bug in towncrier
2018-04-24 21:25:13 -03:00
Bruno Oliveira
69b1c2d4f6
Merge pull request #3424 from nicoddemus/release-3.5.1
...
Preparing release version 3.5.1
2018-04-24 19:30:54 -03:00
turturica
d483b401ee
Merge remote-tracking branch 'upstream/features' into features
2018-04-24 13:45:10 -07:00
turturica
acacf75f49
Added another package-scoped fixture test.
...
Changed existing complex tests to use package fixtures.
2018-04-24 13:32:58 -07:00
Bruno Oliveira
4a92011e6e
Fix note about importing from collections.abc
2018-04-24 07:06:52 -03:00
Ronny Pfannschmidt
6e62fc98ff
Merge pull request #2849 from ApaDoctor/disable-repeated-fixture
...
provide error fixture applied to the same func
2018-04-24 06:36:54 +02:00
Bruno Oliveira
132fb61eba
Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture
2018-04-23 22:24:53 -03:00
Bruno Oliveira
03850cf962
Add test for applying fixture twice
...
Fix #2334
2018-04-23 22:17:46 -03:00
Bruno Oliveira
f05230c679
Move #3221 to trivial section in the CHANGELOG
2018-04-23 19:27:07 -03:00
Bruno Oliveira
d61a7670a1
Merge pull request #3422 from rachel1792/master
...
updated doc to delete deprecated hook: Issue #3417
2018-04-23 19:24:52 -03:00
Bruno Oliveira
8d56641590
Preparing release version 3.5.1
2018-04-23 22:24:21 +00:00
Bruno Oliveira
2a480c59ae
Merge pull request #3367 from brianmaissy/feature/indicative_error_for_parametrize_with_default_argument
...
added indicative error when parametrizing an argument with a default …
2018-04-23 11:04:36 -03:00
Rachel Kogan
6ea4c12da7
updated doc to delete deprecated hook
2018-04-22 21:56:18 -04:00
turturica
f8350c6304
Fix an issue that popped up only on Windows.
2018-04-21 19:51:33 -07:00
turturica
fedc78522b
Build a stack of all previous packages instead of just the one closest to the initial argument(s).
...
Address #3358 by caching nodes in a session dict.
2018-04-21 18:39:42 -07:00
turturica
b0474398ec
Fix a formatting error.
2018-04-20 18:18:44 -07:00
turturica
dc90c9108f
Collapse all parent nested package fixtures when pointing to a sub-node.
...
Example:
Given this hierarchy: p1.s1.s2.s3
I want to run pytest p1/s1/s2/s3/foo.py
If there are any package fixtures defined at p1..s2 levels, they should also be executed.
2018-04-20 17:15:09 -07:00
turturica
69031d0033
Forgot one file from previous commit.
2018-04-20 15:54:21 -07:00
turturica
e44d4e6508
Merge remote-tracking branch 'upstream/features' into features
2018-04-20 15:21:24 -07:00
turturica
c416b1d935
Don't stop at the first package when looking up package-scoped fixtures.
...
Example:
package1.subpackage1
package1.subpackage2
package1's setup/teardown were executed again when exiting subpackage1 and entering subpackage2.
2018-04-20 15:04:58 -07:00
Bruno Oliveira
f0084608cc
Merge pull request #3407 from rachel1792/master
...
Fix typo in caplog fixture documentation: Issue #3406
2018-04-20 17:41:04 -03:00
Bruno Oliveira
cefeba33ef
Update changelog formatting
2018-04-20 17:40:19 -03:00
Bruno Oliveira
3318e53d01
Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch
...
#3290 improve monkeypatch
2018-04-19 17:05:52 -03:00
Ronny Pfannschmidt
1cc79ffc10
Merge pull request #3408 from MarSoft/patch-2
...
Fix typo in the comment
2018-04-19 09:21:11 +02:00
Семён Марьясин
d8015764e6
Fix typo in the comment
2018-04-18 12:47:52 +03:00
turturica
7d923c389e
Merge remote-tracking branch 'upstream/features' into features
2018-04-18 00:11:03 -07:00
Rachel Kogan
48c99f62e3
add changelog
2018-04-17 16:24:32 -04:00
Rachel Kogan
8ff8a82c51
Merge branch 'master' of github.com:pytest-dev/pytest
2018-04-17 16:21:04 -04:00
Rachel Kogan
bb8984f5ed
fix error in caplog docs.
2018-04-17 16:17:29 -04:00
turturica
c02e8d8b0d
Fix test collection when tests are passed as IDs at the command line. Note this is still broken due to #3358 .
2018-04-16 11:44:05 -07:00