1b16d649f9
Fix formatting of merged files
2018-05-25 18:21:48 -03:00
6f8547cc1a
Merge branch 'master' into pre-commit-hook
2018-05-25 18:14:43 -03:00
93fdad28aa
Merge pull request #3499 from jeffreyrack/3491-junit-logging
...
3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.
2018-05-24 20:50:16 -03:00
5a0c9aca63
correctly instantiate fixtureinfo for unittest tests, fixes #3498
2018-05-24 10:29:42 +02:00
6c519b1280
Fixed a bug where stdout and stderr were logged twice by junitxml.
2018-05-23 19:34:45 -07:00
3e08c4ee64
sort out flake8 issues and unicode name usage
2018-05-23 18:12:04 +02:00
703e4b11ba
run black
2018-05-23 16:48:46 +02:00
3e1590bcfc
sort out pyupgrade fallout
2018-05-23 16:45:58 +02:00
9aacb4635e
run pyupgrade
2018-05-23 16:45:09 +02:00
c55db1faac
Merge remote-tracking branch 'upstream/master' into release-3.6.0
2018-05-23 00:03:58 +00:00
5072226f69
Import Mapping and Sequence from compat in python_api::approx
...
Related to https://github.com/pytest-dev/pytest/issues/3339
Fixes a DeprecationWarning on Python 3.7
Adds Mapping to compat
2018-05-22 22:25:15 +02:00
7d0c9837ce
Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filter
...
introduce name filtering for marker iteration again
2018-05-21 13:24:39 -03:00
674879976f
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-05-18 12:30:08 -03:00
d4065a9166
Detect `pytest_` prefixed hooks
...
`pluggy` is deprecating the `implprefix` argument in the next major
release so implement this detection in our derived plugin manager.
Relates to pytest-dev/pluggy#145
2018-05-17 20:38:54 -04:00
afe4800daf
Fix deprecation notice in Node.get_marker
2018-05-15 21:47:40 -03:00
2cd159e8c5
Add section on how to update marks and add ref to the deprecation notice
2018-05-15 21:35:27 -03:00
a4425cb4af
Merge pull request #3469 from scop/dropthedot
...
#dropthedot
2018-05-15 08:00:28 -03:00
b4370c08b9
#dropthedot
2018-05-13 12:09:47 +02:00
aa51fcb2b6
Spelling and grammar fixes
2018-05-13 12:06:09 +02:00
4914135fdf
introduce name filtering for marker iteration again
2018-05-11 21:48:15 +02:00
413b1aa4e9
Rename internal function as suggested during review
2018-05-04 11:08:35 -03:00
dca77b2273
Escape whitespace only strings when diffing them on failed assertions
...
Fix #3443
2018-05-03 20:38:00 -03:00
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
63ef46dd91
fix #3441 - use iter-marks to populate markexpr namespace
2018-05-03 16:28:47 +02:00
c258fe1459
--pdb treats KeyboardInterrupt as exception
2018-05-02 00:58:35 +03:00
63368e07ea
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-24 21:26:45 -03:00
132fb61eba
Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture
2018-04-23 22:24:53 -03:00
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
f0084608cc
Merge pull request #3407 from rachel1792/master
...
Fix typo in caplog fixture documentation: Issue #3406
2018-04-20 17:41:04 -03:00
3318e53d01
Merge pull request #3382 from feuillemorte/3290-improve-monkeypatch
...
#3290 improve monkeypatch
2018-04-19 17:05:52 -03:00
d8015764e6
Fix typo in the comment
2018-04-18 12:47:52 +03:00
8ff8a82c51
Merge branch 'master' of github.com:pytest-dev/pytest
2018-04-17 16:21:04 -04:00
bb8984f5ed
fix error in caplog docs.
2018-04-17 16:17:29 -04:00
857098fe0f
added indicative error when parametrizing an argument with a default value
2018-04-15 20:52:57 +03:00
6626d2aef9
Mention omission of fixtures with leading '_', closes #3398
2018-04-14 11:04:00 +02:00
ba7cad3962
#3290 Fix comments
2018-04-13 16:00:07 +03:00
aa95a425d7
Attempt to solve race-condition which corrupts .pyc files on Windows
...
This uses of the `atomicwrites` library.
This is very hard to create a reliable test for.
Fix #3008
2018-04-12 08:19:28 -03:00
015626ce69
Merge pull request #3384 from nicoddemus/leak-frame
...
Reset reference to failed test frame before each test executes
2018-04-12 07:53:34 -03:00
10a7160549
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-04-11 18:07:47 -03:00
659c044372
#3290 Improved monkeypatch to support some form of with statement
2018-04-11 12:45:26 +03:00
2241c98b18
Merge pull request #3331 from tonybaloney/breakpoint_support
...
Support for the new builtin breakpoint function in Python 3.7
2018-04-10 07:15:29 +02:00
5bd8561016
linting: unfortunate dedent be gone.
2018-04-06 17:36:35 +02:00
846d91fb95
Follow Ronny's advice and use ``type`` in ``base_type``.
2018-04-06 16:23:04 +02:00
0cd74dc324
Ensure object is class before calling issubclass.
2018-04-06 14:40:30 +02:00
ec2d8223cf
Fix issue #3372
2018-04-06 14:16:12 +02:00
ef34de960c
Merge pull request #3360 from RonnyPfannschmidt/xml_property_yay
...
record_property is no longer experimental
2018-04-05 20:03:22 -03:00
1fcadeb2ce
extend marker docs with reasons on marker iteration
2018-04-05 15:30:31 +02:00
ba407b5eb6
Clear sys.last_* attributes before running an item
...
Otherwise we will keep the last failed exception around forever
Related to #2798
2018-04-04 20:36:07 -03:00
9326759a63
Merge pull request #3357 from nicoddemus/session-hooks-ref
...
Add reference docs for pytest_sessionstart/finish and update their docstrings
2018-04-03 07:08:47 +02:00
211f3c47b5
record_property is no longer experimental
2018-04-01 15:39:43 +02:00
Bruno Oliveira
Ronny Pfannschmidt
Jeffrey Rackauckas
Miro Hrončok
Tyler Goodlet
Ville Skyttä
Brian Maissy
Семён Марьясин
Rachel Kogan
Holger Kohr
feuillemorte
Tim Strazny