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
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
7099ea9bb0
py.builtin._reraise -> six.reraise
2018-08-22 23:00:58 -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
Anthony Sottile
0d65783dce
Fix unicode errors when changing to .format(...)
2018-08-22 19:00:43 -07: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
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
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
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
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
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
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
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
f674217c43
Moved dummy_context_manager to compat module
2018-08-18 11:15:58 -03:00
Bruno Oliveira
9f7345d663
Avoid leaving a reference to the last item on CaptureManager
2018-08-18 11:08:03 -03:00
victor
eb2d074530
Black changes.
2018-08-18 14:27:09 +02:00
victor
9fa7745795
Refactor, tests passing.
2018-08-18 13:40:08 +02:00
victor
14db2f91ba
Fixed global not called if no capsys fixture. Using now capsys context manager as well.
2018-08-18 12:16:47 +02:00
Vlad Shcherbina
c3e494f6cf
Replace broken type annotations with type comments
...
Fixes #3826 .
2018-08-18 01:05:30 +03:00
Victor
090f67a980
Refactored implementation and updated tests.
2018-08-17 13:41:26 +02:00
Victor
2b71cb9c38
Added activation/deactivation of capture fixture in logging emit.
2018-08-17 00:26:12 +02:00
Ronny Pfannschmidt
7d4c4c66d4
Merge pull request #3805 from asottile/cause_cycles
...
Fix traceback reporting for exceptions with `__cause__` cycles.
2018-08-16 07:16:51 +02:00
Ronny Pfannschmidt
939a792c41
Merge pull request #3798 from jonozzz/fix-3751
...
Fix #3751
2018-08-16 06:52:16 +02:00
Anthony Sottile
17644ff285
Fix traceback reporting for exceptions with `__cause__` cycles.
2018-08-15 18:15:07 -07:00
Bruno Oliveira
64faa41d06
Merge pull request #3802 from jonozzz/fix-3768
...
Fix test collection from packages mixed with directories. #3768 and #3789
2018-08-15 21:42:25 -03:00
Sankt Petersbug
6367f0f5f1
fix `filterwarnings` mark not registered
2018-08-14 16:13:15 -05:00
Ronny Pfannschmidt
22ee2093b8
Merge pull request #3801 from nicoddemus/improve-warning-addoption
...
Improve warning messages when addoption is called with string as `type`
2018-08-14 09:30:17 +02:00
Josh Holland
abbd7c30a4
Unhide documentation for metafunc.config
...
Fixes #3746 .
2018-08-11 20:48:55 +01:00
turturica
bfd0addaeb
Fix test collection from packages mixed with directories. #3768 and #3789
2018-08-10 12:56:08 -07:00
Bruno Oliveira
be11d3e195
Improve warning messages when addoption is called with string as `type`
...
Encountered the warning myself and to me the message was not clear about
what should be done to fix the warning
2018-08-10 12:49:06 -03:00
turturica
266f05c4c4
Fix #3751
2018-08-09 18:28:22 -07:00
Bruno Oliveira
4d8903fd0b
Merge pull request #3780 from nicoddemus/mock-integration-fix
...
Fix issue where fixtures would lose the decorated functionality
2018-08-09 12:26:09 -03:00
Bruno Oliveira
67106f056b
Use a custom holder class so we can be sure __pytest_wrapper__ was set by us
2018-08-09 09:22:00 -03:00
Wes Thomas
aa358433b0
Fix AttributeError bug in TestCaseFunction.teardown by creating TestCaseFunction._testcase as attribute of class with a None default.
2018-08-08 18:13:21 -05:00
Bruno Oliveira
e723069165
Merge pull request #3771 from nicoddemus/package-infinite-recursion-bug
...
Fix infinite recursion collection bug with pytest_ignore_collect hook
2018-08-06 10:09:31 -03:00
Bruno Oliveira
2c0d2eef40
Only consider actual functions when considering hooks
...
Fix #3775
2018-08-04 16:37:07 -03:00
Bruno Oliveira
ef8ec01e39
Fix issue where fixtures would lose the decorated functionality
...
Fix #3774
2018-08-04 15:14:00 -03:00
Bruno Oliveira
fe0a76e1a6
Fix recursion bug if a pytest_ignore_collect returns False instead of None
2018-08-03 15:40:33 -03:00
Ronny Pfannschmidt
ca0476953e
Merge pull request #3751 from nicoddemus/collect-file-bug
...
Workaround for #3742
2018-08-02 07:35:46 +02:00