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
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
wim glenn
e4bea9068b
end of line for this file, perhaps?
2018-08-19 23:39:10 -05:00
wim glenn
e620798d33
more autodocs for pytester
2018-08-19 23:21:45 -05:00
victor
7ea4992f16
Fixed linting.
2018-08-19 15:46:02 +02:00
victor
0564b52c0e
Fixed integration with other modules/tests
2018-08-19 15:26:57 +02:00
victor
8b2c91836b
Fixed activation and used just runtest_protocol hook
2018-08-19 14:30:50 +02:00
victor
9e382e8d29
Fixed test.
2018-08-19 14:29:57 +02:00
victor
2255892d65
Improved test to cover more cases.
2018-08-19 13:44:12 +02:00
victor
7d9b198f73
Refactoring: Separated suspend from snapping (stopped always snapping when suspending - solves bug but still missing tests), reorganized functions and context managers.
2018-08-19 02:32:36 +02:00
Bruno Oliveira
f4c5994d27
Fixtures during teardown can use capsys and capfd to get output from tests
...
Fix #3033
2018-08-18 14:46:24 -03:00
Tyler Richard
c24c7e75e2
Added regression test for capfd in a fixture
2018-08-18 14:11:04 -03:00
Tyler Richard
273670b2a2
Fixes capfd so data is available after teardown.
2018-08-18 14:11:04 -03:00
Bruno Oliveira
28aff051ab
Merge pull request #3822 from Sup3rGeo/bugfix/capsys-with-cli-logging
...
Bugfix/capsys with cli logging
2018-08-18 14:06:27 -03:00
Bruno Oliveira
29975e5b37
Merge pull request #3827 from Vlad-Shcherbina/funcfixtureinfo-type-hints
...
Replace broken type annotations with type comments
2018-08-18 12:54:47 -03:00
Bruno Oliveira
5cf7d1dba2
"suspend" method of capture fixture private
...
Also change the context-manager to global_and_fixture_disabled to
better convey its meaning
2018-08-18 11:38:08 -03:00
Bruno Oliveira
2fe824b8c4
Merge pull request #3821 from nicoddemus/release-3.7.2
...
Preparing release version 3.7.2
2018-08-18 11:18:18 -03:00