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

7683 Commits

Author SHA1 Message Date
Bruno Oliveira 97bb6abcfa
Merge pull request #3234 from thisch/showcapture_log_support 
Add captured-log support to --show-capture
 2018-02-19 20:46:50 -03:00
Thomas Hisch acda6c46fb Partially revert "Remove --no-print-logs option" 
We'll deprecate --no-print-logs beginning with pytest-4.0.

This reverts commit ac7eb63a6b.
 2018-02-19 20:34:11 +01:00
Thomas Hisch ac7eb63a6b Remove --no-print-logs option 
This option is superseded by the --show-capture option. With --no-print-logs
it was possible to only disable the reporting of captured logs, which is no
longer possible with --show-capture. If --show-capture=no is used, no
captured content (stdout, stderr and logs) is reported for failed tests.
 2018-02-18 20:48:07 +01:00
Thomas Hisch 51ece00923 Add captured-log support to --show-capture 
Fixes: #3233
 2018-02-18 20:18:37 +01:00
Bruno Oliveira b486e1294b
Merge pull request #3222 from The-Compiler/match-msg 
Remove "matching '...'" part from the pytest.raises message
 2018-02-17 21:18:05 -02:00
Bruno Oliveira 3bc8b50a0d
Merge pull request #3228 from thisch/update_attr 
Update minimal attrs library to v17.4.0
 2018-02-17 20:19:07 -02:00
Bruno Oliveira 81fa547fa8 Add CHANGELOG entry about changed attrs req 2018-02-17 20:18:32 -02:00
Bruno Oliveira 9d879bee36
Merge pull request #3215 from pytest-dev/bugfix/985/disable-output-capturing-in-doctest 
Disable output capturing in doctest
 2018-02-17 18:39:32 -02:00
Brian Maissy 069f32a8c4 print captured logs before entering pdb 2018-02-17 20:32:49 +02:00
Jason R. Coombs 4131d3f300 Probably it's best to write the err stream to stderr. 2018-02-17 12:13:33 -05:00
Jason R. Coombs 254e357076 Correct the broken indentation. 2018-02-17 12:10:29 -05:00
Bruno Oliveira f263932883
Merge pull request #3232 from nicoddemus/merge-upstream 
Merge master into features
 2018-02-17 12:59:55 -02:00
Bruno Oliveira 0f6879bf5e
Small update to changelog/README.rst 2018-02-17 10:20:41 -02:00
Bruno Oliveira bfe2cbe875 Implement publishing to PyPI by pushing a tag 
Fix #3060
 2018-02-17 10:13:25 -02:00
Bruno Oliveira 69d608aec3 Merge remote-tracking branch 'upstream/master' into merge-upstream 2018-02-17 09:38:06 -02:00
Bruno Oliveira dfbaa20240 Bring test_live_logs_unknown_sections directly due to merge conflicts 2018-02-17 09:36:46 -02:00
Bruno Oliveira fa8354e872
Merge pull request #3213 from thisch/collection_deselection 
Show deselection count before tests are executed
 2018-02-17 09:03:26 -02:00
Bruno Oliveira 00d3001138
Merge pull request #3188 from s0undt3ch/issues/3184 
Don't traceback on unkown sections.
 2018-02-17 09:02:44 -02:00
Bruno Oliveira 05faa69c37
Merge pull request #3194 from s0undt3ch/feature/logstart-logfinish 
Fix issue where a new line was always written for the live log finish section
 2018-02-16 21:19:38 -02:00
Bruno Oliveira b1abe5db23
Merge pull request #3201 from uSpike/deselect_cli 
Add "--deselect" command line option
 2018-02-16 20:50:22 -02:00
Jordan Speicher 774c539f1a Add --deselect command line option 
Fixes #3198
 2018-02-16 08:17:37 -06:00
Bruno Oliveira df2f019997
Slight rewording in the CHANGELOG 2018-02-15 19:45:05 -02:00
Bruno Oliveira 6bc45d158d
Merge pull request #3186 from brianmaissy/bugfix/print_captured_stdout_before_entering_pdb 
Added printing of captured stdout before entering pdb
 2018-02-15 19:38:23 -02:00
Bruno Oliveira 371eb8c6af
Merge pull request #3206 from mbachry/fix-unittest-mock 
Fix mock patchings detection when both mock and unittest.mock are present
 2018-02-15 19:35:44 -02:00
Thomas Hisch 82cdc487ce Fix raised warning when attrs 17.4.0 is used 
Related: #3223
 2018-02-15 21:09:44 +01:00
Jason R. Coombs 435b8ddc7c
Rename method for additional clarity. 2018-02-15 09:17:33 -05:00
Florian Bruhin 3cbf0c8ec0 Raise unexpected exceptions with pytest.raises() using match= 2018-02-15 12:11:56 +01:00
Florian Bruhin 9849022eb2 Remove "matching '...'" part from the pytest.raises message 
When a test with pytest.raises(ValueError, match='foo') doesn't raise, the
following error is printed:

    Failed: DID NOT RAISE <class 'ValueError'> matching 'foo'

This error message is confusing as it implies a ValueError was raised, but the
message wasn't matching 'foo'.

I first considered rewording it somehow to preserve the match pattern in it, but
I don't think that's worthwhile as the pattern should usually be apparent from
the stacktrace anyways (hard-coded, as parametrization, or with --showlocals for
more sophisticated cases).
 2018-02-14 19:20:00 +01:00
Jason R. Coombs 18c84a1904 Restrict fix to macOS only. Ref #3215. 2018-02-13 17:51:20 -05:00
Thomas Hisch 6496131b79 Show deselection count before tests are exectued 
Fixes #1527
 2018-02-13 22:27:02 +01:00
feuillemorte dff0500114 #3034 Added new option "--new-first" 2018-02-13 22:49:28 +03:00
Jason R. Coombs 247cdb835a Remove xfail; tests now pass on macOS. Ref #985. 2018-02-13 12:41:19 -05:00
Jason R. Coombs ce1872e7e8 Merge branch 'master' into bugfix/985/disable-output-capturing-in-doctest 2018-02-13 12:33:07 -05:00
Jason R. Coombs d845af7b24 Add changelog. Ref #985. 2018-02-13 12:32:00 -05:00
Jason R. Coombs 391553887b Disable output capturing in doctest to avoid losing reference to stdout. Fixes #985. 2018-02-13 12:08:39 -05:00
Brian Maissy 7656fc8320 Added printing of captured stdout and stderr before entering pdb 2018-02-12 23:17:51 +02:00
Marcin Bachry b6166dccb4 Fix mock patchings detection when both mock and unittest.mock are present 2018-02-12 20:29:37 +01:00
Bruno Oliveira e7bcc854d9
Merge pull request #3202 from rouge8/pytest-raises-sphinx-parameters 
Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`
 2018-02-10 02:32:56 -02:00
Bruno Oliveira ffee213c85
Update and rename 3202.trivial.rst to 3202.doc.rst 2018-02-09 22:51:15 -02:00
Andy Freeland e5b527d0e3 Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()` 2018-02-09 16:28:17 -08:00
Bruno Oliveira 063e2da967
Merge pull request #3176 from feuillemorte/1478_no_stdout_option 
#1478 Added --no-stdout option
 2018-02-09 18:36:36 -02:00
feuillemorte da5882c2d5 #1478 Add doc and remove print 2018-02-09 21:36:48 +03:00
Bruno Oliveira c04e248de5
Rename 3161.bugfix to 3161.bugfix.rst 2018-02-09 14:06:24 -02:00
Pedro Algarvio d776e5610e
Fix issue where a new line was always written for the live log finish section 2018-02-09 11:17:01 +00:00
Bruno Oliveira bba258aa5e
Merge pull request #3190 from s0undt3ch/feature/logs-stream 
Expose `log_cli` as a CLI parser option.
 2018-02-08 17:07:48 -02:00
Florian Bruhin 3685c1bc01
Merge pull request #3192 from nicoddemus/pr-template 
Add changelog/README.rst and streamline our PR template text
 2018-02-08 19:20:54 +01:00
Bruno Oliveira a4cbd03535 Fix linting 2018-02-08 13:22:32 -02:00
feuillemorte 71367881ed #1478 Added --show-capture=both option (fix comments) 2018-02-08 16:21:22 +03:00
Bruno Oliveira ad7d63df97 Rename _stream_logs_enabled to _log_cli_enabled and remove _stream_logs 2018-02-08 09:48:51 -02:00
Bruno Oliveira eea169e515 Code review suggestions 2018-02-08 08:03:14 -02:00