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

8631 Commits

Author SHA1 Message Date
turturica 3396225f74 Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854 2018-08-24 11:47:24 -07:00
Bruno Oliveira c82906105c
Merge pull request #3865 from GandalfSaxe/patch-1 
Move information on `pip install -e` to the top
 2018-08-24 07:28:51 -03:00
Anthony Sottile 4c14740798
Merge pull request #3868 from asottile/bytes_py26_plus 
Use `bytes` directly instead of `binary_type`
 2018-08-23 23:16:59 -07:00
Jeffrey Rackauckas 5fefc48f33 Fixing pre-commit hooks 2018-08-23 23:00:02 -07:00
turturica 72e6482994 Make linting happy. 2018-08-23 22:58:36 -07:00
Jeffrey Rackauckas 93f783228c Add the progress_display_mode ini option 2018-08-23 22:56:25 -07:00
turturica 5f8b50c094 Address #3796 and add a test for it. 2018-08-23 22:48:44 -07:00
Anthony Sottile 99e31f6fb1 Use `bytes` directly instead of `binary_type` 
`bytes` is an alias for `str` in python2.6+
 2018-08-23 18:55:21 -07:00
Anthony Sottile f2e35c8c4f
Merge pull request #3859 from asottile/pyupgrade_1_4 
Some pyupgrade 1.4.x changes
 2018-08-23 18:32:53 -07:00
Bruno Oliveira 40b4fe64af Fix linting 2018-08-23 22:11:17 -03:00
Bruno Oliveira d10d59c013
Merge pull request #3858 from mimi1vx/test_mock 
Use unittest.mock if is only aviable
 2018-08-23 19:02:39 -03:00
wim glenn d54aa8ce13
Merge pull request #3848 from wimglenn/pytester_unicode_bugfixes 
fixed a bunch of unicode bugs in pytester.py
 2018-08-23 13:45:49 -05:00
Anthony Sottile 52fa8c98bb
Merge pull request #3864 from asottile/source_to_dedent 
Replace Source with dedent where possible
 2018-08-23 10:45:11 -07:00
Gandalf Saxe 3f336869e2
Move information on `pip install -e` to the top 
Should fix complaints in #2421.
 2018-08-23 18:07:28 +02:00
Anthony Sottile 85482d575e Replace Source with dedent where possible 2018-08-23 09:06:17 -07:00
Bruno Oliveira 6f7365509d
Merge pull request #3860 from asottile/purge_more_py 
Purge more usage of `py` module
 2018-08-23 06:05:32 -03:00
Anthony Sottile 7099ea9bb0 py.builtin._reraise -> six.reraise 2018-08-22 23:00:58 -07:00
Anthony Sottile dccac69d82 py.builtin.text -> six.text_type 2018-08-22 23:00:06 -07:00
Anthony Sottile c2cd337886 py.builtin.exec_ => six.exec_ 2018-08-22 23:00:06 -07:00
Anthony Sottile 0fc4a806e5 py.builtins._totext -> string literals or six.text_type 2018-08-22 23:00:04 -07:00
turturica 4d3c1ab4f0 Fixes #3854 2018-08-22 21:42:59 -07:00
turturica e4f76f6350 Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854 2018-08-22 20:36:52 -07:00
Anthony Sottile 0d65783dce Fix unicode errors when changing to .format(...) 2018-08-22 19:00:43 -07:00
Anthony Sottile 8bb8b91357 pyupgrade 1.4: tests 2018-08-22 18:47:21 -07:00
Bruno Oliveira 8804c7333a
Fix CHANGELOG formatting 2018-08-22 20:06:13 -03:00
Bruno Oliveira 17eec5b97e
Merge pull request #3856 from jennirinker/master 
Resolving Issue #3824
 2018-08-22 19:03:55 -03:00
Ondřej Súkup cd07c4d4ff
Use unittest.mock if is only aviable 
from Python 3.3 is mock part of python standard library in unittest namespace
 2018-08-22 23:49:40 +02:00
wim glenn 917b99e438
More unicode whack-a-mole 
It seems pytest's very comprehensive CI sniffed out a few other places with similar bugs.  Ideally we should find all the places where args are not stringy and solve it at the source, but who knows how many people are relying on the implicit string conversion.  See [here](https://github.com/pytest-dev/pytest/blob/master/src/_pytest/config/__init__.py#L160-L166) for one such problem area (args with a single py.path.local instance is converted here, but a list or tuple containing some are not).
 2018-08-22 13:40:21 -05:00
wim glenn b08e156b79
strip trailing whitespace 2018-08-22 11:27:36 -05:00
wim glenn 8e2c7b4979
Add a failing testcase for PR #3848 2018-08-22 11:00:51 -05:00
Bruno Oliveira 5a7aa123ea Improve docs formatting 2018-08-22 11:22:30 -03:00
Jennifer Rinker a12eadd9ef resolving Issue #3824 - expanding docs 2018-08-22 15:37:35 +02:00
Bruno Oliveira 2137e2b15b
Merge pull request #3846 from nicoddemus/issue-3843 
Fix collection error when tests is specified with --doctest-modules
 2018-08-22 08:17:07 -03:00
wim glenn 89446af51e
fixed a bunch of unicode bugs in pytester.py 2018-08-22 01:30:23 -05:00
Ronny Pfannschmidt 3b521bedf8
Merge pull request #3841 from sankt-petersbug/fix-3816 
Fix '--show-capture=no' capture teardown logs
 2018-08-22 07:16:53 +02:00
Ronny Pfannschmidt 5b2c8fa007
Merge pull request #3845 from natanlao/patch-1 
Remove warning about #568 from documentation
 2018-08-22 07:12:40 +02:00
Bruno Oliveira eb8d145195
Add link to issue in the CHANGELOG entry 2018-08-21 21:08:21 -03:00
Natan Lao 80bea79512 Add changelog entry 2018-08-21 17:04:56 -07:00
Bruno Oliveira 07a560ff24 Fix collection error when tests is specified with --doctest-modules 
The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.

Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.

Fix #3843
 2018-08-21 21:02:46 -03:00
Natan Lao 717775a1c6
Remove warning about #568 from documentation 
The documentation (https://docs.pytest.org/en/latest/skipping.html) references
issue #568, which has since been fixed.
 2018-08-21 16:57:33 -07:00
Bruno Oliveira 672f4bb5aa
Improve CHANGELOG 2018-08-21 20:19:48 -03:00
Bruno Oliveira f1079a8222
Merge pull request #3832 from Sup3rGeo/bugfix/capsys-with-cli-logging 
Bugfix/capsys with cli logging (again)
 2018-08-21 20:12:31 -03:00
Bruno Oliveira 044d2b8e6e
Merge pull request #3838 from wimglenn/runresult_xfail 
Support xfailed and xpassed outcomes in RunResult.
 2018-08-20 20:01:51 -03:00
Sankt Petersbug 223eef6261 Fix '--show-capture=no' capture teardown logs 
Add a check before printing teardown logs.

'print_teardown_sections' method does not check '--show-capture' option
value, and teardown logs are always printed.

Resolves: #3816
 2018-08-20 15:01:21 -05:00
Bruno Oliveira 43657f252f
Merge pull request #3830 from nicoddemus/capfd-fixture-capture 
Fixtures during teardown can use capsys and capfd to get output from tests
 2018-08-20 15:32:45 -03:00
Victor 70ebab3537 Renamed snap_global_capture to read_global_capture. 2018-08-20 17:48:14 +02:00
Ronny Pfannschmidt d3bdfc704b
Merge pull request #3839 from asottile/more_flexible 
Use more flexible `language_version: python3`
 2018-08-20 16:13:31 +02:00
Anthony Sottile 4de247cfa0 Use more flexible `language_version: python3` 2018-08-20 06:27:35 -07:00
Victor d611b03589 Parametrized tests for capfd as well. Separated global capture test. 2018-08-20 12:23:59 +02:00
Anthony Sottile 308d789d92
Merge pull request #3835 from wimglenn/issue3833 
more autodocs for pytester
 2018-08-20 00:30:28 -07:00