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

10740 Commits

Author SHA1 Message Date
Victor Maryama 6f851e6cbb Merge remote-tracking branch 'upstream/master' into features-assertion-pass-hook-master 
# Conflicts:
#	src/_pytest/assertion/rewrite.py
 2019-06-26 18:12:56 +02:00
Victor Maryama 9a34d88c8d Explanation variables only defined if failed or passed with plugins implementing the hook. 2019-06-26 18:10:16 +02:00
Victor Maryama d91a5d3cd7 Further reverting changes. 2019-06-26 18:10:16 +02:00
Victor Maryama f755ff6af1 Black formatting. 2019-06-26 18:10:16 +02:00
Victor Maryama d638da5821 Using ini-file option instead of cmd option. 2019-06-26 18:10:16 +02:00
Victor Maryama 0fb52416b1 Reverted changes. 2019-06-26 18:10:15 +02:00
Bruno Oliveira 6a2d844c5d
Fix typo replace `circuting` with `circuiting`. (#5497) 
Fix typo replace `circuting` with `circuiting`.
 2019-06-26 11:09:22 -03:00
Bruno Oliveira a48feb3261
Delete 5497.trivial.rst 
Just a typo, no need for a changelog entry. :)
 2019-06-26 11:09:04 -03:00
Anthony Sottile 6cf8e71dca
Merge pull request #5496 from pytest-dev/stray_comment 
Delete stray comment
 2019-06-26 05:59:38 -07:00
Tim Gates 994c32235c
Fix rst support 2019-06-26 20:46:09 +10:00
Tim Gates d81f758285
Update changelog with trivial as per ./CONTRIBUTING.rst 2019-06-26 20:31:45 +10:00
Tim Gates fdb6e35b1b
Fix typo replace `circuting` with `circuiting`. 2019-06-26 20:23:35 +10:00
Victor Maryama 7efdd5063b
Update src/_pytest/assertion/rewrite.py 
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2019-06-26 10:50:27 +02:00
Anthony Sottile bfba33ec9e Delete stray comment 2019-06-25 20:24:13 -07:00
Anthony Sottile 3f3f3e7a29
Merge pull request #5495 from nicoddemus/blueyed/cmp-bytes 
Improve comparison of byte strings (supersedes #5267)
 2019-06-25 19:16:24 -07:00
Bruno Oliveira aaf40314d1
Do not attempt to rewrite non-source files (#5490) 
Do not attempt to rewrite non-source files
 2019-06-25 20:43:23 -03:00
Bruno Oliveira 3f2344e8f7 Show bytes ascii representation instead of numeric value 2019-06-25 20:40:25 -03:00
Daniel Hahler 8c7eb82363 Fix/improve comparison of byte strings 
Fixes https://github.com/pytest-dev/pytest/issues/5260.
 2019-06-25 20:15:45 -03:00
Bruno Oliveira 1aefb24b37
Merge features into master (#5491) 
Merge features into master
 2019-06-25 20:02:02 -03:00
Zac Hatfield-Dodds ed85c83154 Deprecate funcargnames alias 2019-06-26 08:53:17 +10:00
Anthony Sottile bd647fdd8b Revert allow_abbrev=False in helper scripts 2019-06-25 14:50:07 -07:00
Victor Maryama 80ac910a24 Added msg to docstring for cleaning pyc. 2019-06-25 19:49:57 +02:00
Victor Maryama 4db5488ed8 Now dependent on command line option. 2019-06-25 19:49:05 +02:00
Victor Maryama cfbfa53f2b Using pytester subprocess to avoid keeping references in the HookRecorder. 2019-06-25 17:46:56 +02:00
Victor Maryama db50a975fd Reverted leak fixture test. 2019-06-25 17:23:14 +02:00
Bruno Oliveira 019455298b Merge remote-tracking branch 'upstream/features' into merge-features-into-master 2019-06-25 12:07:54 -03:00
Bruno Oliveira 64a6365227
Include pytest version in the cached pyc tags (#5484) 
Include pytest version in the cached pyc tags
 2019-06-25 12:07:01 -03:00
Anthony Sottile b991810f32 Do not attempt to rewrite non-source files 2019-06-25 08:00:20 -07:00
Zac Hatfield-Dodds 4d5780facf
Merge pull request #5469 from Zac-HD/disallow-abbrev 
Disallow abbreviated command-line options
 2019-06-25 22:38:52 +10:00
Victor Maryama 81e3f3cf95 Black formatting 2019-06-25 10:41:11 +02:00
Victor Maryama 2280f28596 Black formatting. 2019-06-25 10:36:01 +02:00
Victor Maryama f8c9a7b86d Formatting and removed py2 support. 2019-06-25 10:35:42 +02:00
Victor Maryama 98b212cbfb Added "experimental" note. 2019-06-25 10:35:09 +02:00
Zac Hatfield-Dodds d72fb73fa0 Do not allow abbreviated arguments 2019-06-25 13:51:33 +10:00
Bruno Oliveira a54e2e19f5
Clarify changelog entries should be rst files (#5485) 
Clarify changelog entries should be rst files
 2019-06-24 22:33:40 -03:00
Bruno Oliveira 37fce6c6e5
Pickup addition positional args passed to _parse_parametrize_ar… (#5483) 
Pickup addition positional args passed to _parse_parametrize_args
 2019-06-24 22:05:19 -03:00
Kevin J. Foley 23aa3bb0ae Clarify changelog entries should be rst files 2019-06-24 20:55:51 -04:00
Kevin J. Foley 95714436a1 Pickup additional positional args passed to _parse_parametrize_args 2019-06-24 20:43:52 -04:00
Bruno Oliveira f43fb13179 Include pytest version in the cached pyc tags 
Fix #1671
 2019-06-24 20:37:07 -03:00
Bruno Oliveira 3f5b078462
Merge pull request #5441 from nicoddemus/faulthandler-5440 
Integrate pytest-faulthandler into the core
 2019-06-24 20:01:15 -03:00
Bruno Oliveira 63c4802be0
minor: clarify help with reportchars (#5475) 
minor: clarify help with reportchars
 2019-06-24 19:59:15 -03:00
Anthony Sottile a24933b0a6
Merge pull request #5481 from asottile/minor_py3_cleanup 
Use new raise syntax in one case
 2019-06-24 12:06:53 -07:00
Anthony Sottile 380ca8f880 Use new raise syntax in one case 2019-06-24 11:24:03 -07:00
Anthony Sottile 61dcb84f0d
Merge pull request #5468 from asottile/switch_importlib_to_imp 
Switch from deprecated imp to importlib
 2019-06-24 11:22:01 -07:00
Anthony Sottile 4cd08f9b52 Switch from deprecated imp to importlib 2019-06-24 09:48:38 -07:00
Victor Maryama 52e695b329 Removed debug code. 2019-06-24 17:47:48 +02:00
Victor Maryama 9a89783fbb Assertion passed hook 2019-06-24 16:09:39 +02:00
Daniel Hahler 01a094cc43 minor: clarify help with reportchars 
`-ra` / `-rA` will include "w" also.  This does not explicitly mention
it (allowing for change the behavior), but makes it a) clearer that "w"
is a recognized reportchar, and b) less confusing that `-ra
--disable-warnings` still displays them.
 2019-06-24 06:07:52 +02:00
Bruno Oliveira 3ce31b6370 Change pytest-faulthandler for simplification 
* The --no-faulthandler option is not necessary given that we can use
  `-p no:faulthandler`.

* The `--faulthandler-timeout` command-line option has become an ini
  option, for the reasons described in
  https://github.com/pytest-dev/pytest-faulthandler/issues/34 and
  users can still set it from the command-line.

Fix pytest-dev/pytest-faulthandler#34
 2019-06-22 19:22:43 -03:00
Bruno Oliveira 3d01dd3adf
Update cache.rst (#5465) 
Update cache.rst
 2019-06-21 21:12:30 -03:00