jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,820 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

2536 Commits

Author SHA1 Message Date
Bruno Oliveira 674879976f Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-05-18 12:30:08 -03:00
Bruno Oliveira a4425cb4af
Merge pull request #3469 from scop/dropthedot 
#dropthedot
 2018-05-15 08:00:28 -03:00
Ville Skyttä b4370c08b9 #dropthedot 2018-05-13 12:09:47 +02:00
Ville Skyttä aa51fcb2b6 Spelling and grammar fixes 2018-05-13 12:06:09 +02:00
Bruno Oliveira 413b1aa4e9
Rename internal function as suggested during review 2018-05-04 11:08:35 -03:00
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 63ef46dd91 fix #3441 - use iter-marks to populate markexpr namespace 2018-05-03 16:28:47 +02:00
Brian Maissy c258fe1459 --pdb treats KeyboardInterrupt as exception 2018-05-02 00:58:35 +03: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 132fb61eba Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repeated-fixture 2018-04-23 22:24:53 -03: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
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 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
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
Brian Maissy 857098fe0f added indicative error when parametrizing an argument with a default value 2018-04-15 20:52:57 +03:00
Holger Kohr 6626d2aef9 Mention omission of fixtures with leading '_', closes #3398 2018-04-14 11:04:00 +02:00
feuillemorte ba7cad3962 #3290 Fix comments 2018-04-13 16:00:07 +03:00
Bruno Oliveira 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
Bruno Oliveira 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
Bruno Oliveira 10a7160549 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-04-11 18:07:47 -03:00
feuillemorte 659c044372 #3290 Improved monkeypatch to support some form of with statement 2018-04-11 12:45:26 +03:00
Ronny Pfannschmidt 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
Tim Strazny 5bd8561016 linting: unfortunate dedent be gone. 2018-04-06 17:36:35 +02:00
Tim Strazny 846d91fb95 Follow Ronny's advice and use ``type`` in ``base_type``. 2018-04-06 16:23:04 +02:00
Tim Strazny 0cd74dc324 Ensure object is class before calling issubclass. 2018-04-06 14:40:30 +02:00
Tim Strazny ec2d8223cf Fix issue #3372 2018-04-06 14:16:12 +02:00
Bruno Oliveira ef34de960c
Merge pull request #3360 from RonnyPfannschmidt/xml_property_yay 
record_property is no longer experimental
 2018-04-05 20:03:22 -03:00
Ronny Pfannschmidt 1fcadeb2ce extend marker docs with reasons on marker iteration 2018-04-05 15:30:31 +02:00
Bruno Oliveira 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
Ronny Pfannschmidt 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
Ronny Pfannschmidt 211f3c47b5 record_property is no longer experimental 2018-04-01 15:39:43 +02:00
Ronny Pfannschmidt e4a52c1795 prevent doubleing of function level marks 2018-03-30 08:19:45 +02:00
Ronny Pfannschmidt 802da781c6 fix method reference to iter_markers in warning 2018-03-30 07:50:12 +02:00
Bruno Oliveira 3fc2c94b5e Switch imports based on python versions, my bad 2018-03-29 23:15:03 -03:00
Bruno Oliveira daf1de0fed Add reference docs for pytest_sessionstart/finish and update their docstrings 2018-03-29 19:48:48 -03:00
Bruno Oliveira 8ca9321940 Move compatibility imports to compat.py and fix linting 2018-03-29 19:02:35 -03:00
Irmen de Jong faded25ee8 chage collections.abc import to fix deprecation warnings on python 3.7 2018-03-29 20:02:00 +02:00
Ronny Pfannschmidt dbb1b5a227 remove NodeMarkers, turn own_markers into a list and use iter_markers api exclusively 2018-03-29 18:24:10 +02:00
Ronny Pfannschmidt 8805036fd8 add node iteration apis 
TODO: add tests
 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt ee51fa5881 add api to iterate over all marerks of a node 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt 2cb7e725ce document the hack used to avoid duplicate markers due Instance collectors 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt 02315c0489 remove unnecessary of in the code figuring the fixture names 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt a92a51b01b clarify find_markers return value 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt 159ea9b7c0 turn Markinfo into atts clsas, and return correct instances of it from node.get_marker 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt ced1316bc8 add docstrings for nodemarkers 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt 5e56e9b4f6 refactor node markers, remove need to be aware of nodes 2018-03-29 17:52:01 +02:00
Ronny Pfannschmidt 2d06ae0f65 base metafunc fixtureinfo on the functiondefinition to caputure its marks 2018-03-29 17:52:01 +02:00