f6eb39df33
Merge pull request #4001 from asottile/fix_bytes_repr_text_mix_python_2
...
Fix UnicodeDecodeError in assertion with mixed non-ascii bytes repr + text
2018-09-20 22:16:37 +02:00
7122fa5613
Fix UnicodeDecodeError in assertion with mixed non-ascii bytes repr + text
2018-09-19 20:24:00 -07:00
7aff81739e
Merge pull request #3998 from blueyed/logging-del
...
logging: del item.catch_log_handler only in teardown
2018-09-19 20:07:19 -03:00
27772f67c0
Merge pull request #3987 from nicoddemus/fix-find-scope-3941
...
Fix scope determination with indirect parameters
2018-09-19 20:06:45 -03:00
e7eb7e799b
logging: del item.catch_log_handler only in teardown
...
Without this caplog.record_tuples etc is not available anymore when using
`--pdb`.
2018-09-19 17:17:47 +02:00
048342817b
Add testcase for logging to file
2018-09-18 21:47:42 +02:00
e967d4587a
Add support for logging in collection-phase
...
The logging plugin does not output log messages generated during the
collection-phase when live-logging is enabled. This fixes this.
Fixes #3964
2018-09-18 20:18:24 +02:00
a79dc12f1e
Merge pull request #3970 from sambarluc/raise_on_empty_parameterset
...
Raise exception if parametrize collects an empty parameter set
2018-09-18 08:11:34 -03:00
37d2469266
Use a PurePath instance to do matching against patterns in assertion rewrite
...
This way we don't need to have real file system path, which prevents the
original #3973 bug.
2018-09-17 20:29:09 -03:00
1df6d28080
Fix assertion rewriter crash if cwd changes mid-testing
...
Unfortunately we need to get a `py.path.local` object to perform the fnmatch
operation, it is different from the standard `fnmatch` module because it
implements its own custom logic. So we need to use `py.path` to perform
the fnmatch for backward compatibility reasons.
Ideally we should be able to use a "pure path" in `pathlib` terms (a path
not bound to the file system), but we don't have those in pylib.
Fix #3973
2018-09-17 20:04:44 -03:00
05155e4db0
Fail at parametrize option for empty parameter set
...
Optionally raise an exception when parametrize collects no arguments.
Provide the name of the test causing the failure in the exception
message.
See: #3849
2018-09-15 09:18:03 +02:00
86a14d007d
Fix scope determination with indirect parameters
...
Fix #3941
2018-09-14 21:33:59 -03:00
87ddb2dbd5
Change flaky test_request_garbage to provide more debug information
...
This test fails *very* rarely when running in xdist.
2018-09-14 15:25:45 -03:00
9aa6b0903b
.pytest_cache is now automatically ignored by Git
2018-09-14 15:16:40 -03:00
feb8240410
Use self.Function again during collection
2018-09-13 15:44:02 -03:00
b7dd9154c3
Deprecate custom node types during collection by using special names
2018-09-13 14:55:28 -03:00
482bd5efd2
Show deprecation warning for cached_setup
2018-09-13 14:25:46 -03:00
bf074b37a3
Show deprecation warnings for compat properties
...
Fix #3616
2018-09-13 14:10:30 -03:00
a0ce9a4441
remove the legacy code about im_func and generalize using fix and compat.getimfunc
2018-09-13 15:38:36 +02:00
7537e94ddf
tests: use unittest.mock with py34+
...
Fixes https://github.com/pytest-dev/pytest/issues/3965 .
Has to work around https://github.com/tox-dev/tox/issues/706 .
No coverage for pluggymaster builds is OK though anyway.
2018-09-12 23:21:47 +02:00
ab40696007
-W now takes precedence over filters in ini files
...
Fix #3946
2018-09-11 19:00:42 +02:00
c00d934b21
Merge pull request #3933 from nicoddemus/idval-hypothesis-flaky-3707
...
Use -n auto now that xdist behaves well in Travis and AppVeyor
2018-09-06 15:15:55 -03:00
5eb85efa14
Use -n auto now that xdist behaves well in Travis and AppVeyor
...
This hopefully fixes the flaky test_idval_hypothesis on AppVeyor
Fix #3707
2018-09-06 09:22:13 -03:00
69b34f7658
Merge remote-tracking branch 'upstream/master' into release-3.8.0
2018-09-05 18:02:02 -03:00
531b76a513
Merge pull request #3931 from nicoddemus/internal-warnings
...
Use standard warnings for internal pytest warnings
2018-09-05 14:05:52 -03:00
f63c683faa
No longer escape regex in pytest.mark.filterwarnings
...
Fix #3936
2018-09-05 10:20:25 -03:00
ddb308455a
Make sure warn is called in test_parameterset_extractfrom
2018-09-05 09:01:29 -03:00
adc9ed85bc
Fix test_idval_hypothesis
2018-09-04 18:49:20 -03:00
4592def14d
Improve test_rewarn_functional
2018-09-04 17:02:56 -03:00
2e0a7cf78d
Revert to having just "runtest" as "when" parameter of the pytest_warning_captured hook
2018-09-04 17:01:23 -03:00
5a52acaa92
Make config no longer optional in parametrize id functions
2018-09-04 16:55:52 -03:00
b7560a8808
Keep backward compatibility for code as kw in Node.warn
2018-09-04 16:48:21 -03:00
d3ca739c00
Use explicit instances when calling warnings.warn_explicit
2018-09-04 16:29:48 -03:00
438f7a1254
Add "setup", "call" and "teardown" values to "when" parameter of pytest_warning_captured hook
2018-09-04 15:53:17 -03:00
47bf58d69e
Make Node.warn support two forms, new and deprecated
...
As suggested during review, it now accepts two forms:
Node.warn(warning_instance) (recommended)
Node.warn(code, message) (deprecated)
2018-09-04 15:53:17 -03:00
5ef51262f7
Fix reference to PytestWarning in warningsfilter mark
2018-09-04 15:06:14 -03:00
f1cfd10c94
Handle cache warnings in tests
2018-09-04 14:44:02 -03:00
b42518acd5
Change std_warn to receive a single warning instance, addressed review suggestions
2018-09-04 14:20:42 -03:00
9ae0a3cd85
Do not trigger warning about tuples being always True if the tuple has size != 2
2018-09-04 13:41:11 -03:00
56d414177a
Remove nodeid from messages for warnings generated by standard warnings
...
Standard warnings already contain the proper location, so we don't need
to also print the node id
2018-09-04 11:35:34 -03:00
0fffa6ba2f
Implement hack to issue warnings during config
...
Once we can capture warnings during the config stage, we can
then get rid of this function
Related to #2891
2018-09-04 11:35:34 -03:00
60499d221e
Add test to ensure that users can suppress internal warnings
2018-09-04 11:35:34 -03:00
9965ed84da
Show deprecation warnings by default if no other filters are configured
...
Fix #2908
2018-09-04 11:35:34 -03:00
19a01c9849
Make PytestWarning and RemovedInPytest4Warning part of the public API
2018-09-04 11:35:34 -03:00
78ac7d99f5
Deprecate Config.warn and Node.warn, replaced by standard warnings
2018-09-04 11:35:34 -03:00
0c8dbdcd92
Fix existing tests now that we are using standard warnings
2018-09-04 11:35:34 -03:00
8e4501ee29
Use std_warn for warning about applying marks directly to parameters
2018-09-04 11:35:34 -03:00
0100f61b62
Start the laywork to capture standard warnings
2018-09-04 11:35:15 -03:00
1a9d913ee1
Capture and display warnings during collection
...
Fix #3251
2018-09-04 11:35:06 -03:00
3fcc4cdbd5
Make terminal capture pytest_warning_capture
...
pytest_logwarning is no longer emitted by the warnings plugin,
only ever emitted from .warn() functions in config and item
2018-09-04 11:35:06 -03:00
ffd47ceefc
Implement new pytest_warning_captured hook
2018-09-04 11:35:00 -03:00
b01704cce1
Fix exit code for command line errors
...
Fixes #3913
2018-09-03 04:16:35 +00:00
4675912d89
Add tests for early rewrite bailout code and handle patterns with subdirectories
2018-09-01 10:59:21 -03:00
2256f2f04d
Remove test which is no longer required and improve test_lf_and_ff_prints_no_needless_message
...
* test_lf_and_ff_obey_verbosity is no longer necessary because
test_lf_and_ff_prints_no_needless_message already checks if the proper messages
are displayed when -q is used.
* Improve test_lf_and_ff_prints_no_needless_message so we also check that
the correct message is displayed when there are failures to run
2018-08-31 08:01:55 -03:00
11e591e442
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-08-30 19:55:23 -03:00
3035b2724d
T3853:removed needless message printed with --failed-first,--last-failed and no failed tests
2018-08-30 16:01:42 +05:30
8ef21f56d3
Fix 404
2018-08-28 14:42:16 -07:00
10c1c7c41a
Merge pull request #3895 from nicoddemus/issue-3506
...
Avoid possible infinite recursion when writing pyc files in assert rewrite
2018-08-28 18:16:10 -03:00
b77e533693
Merge pull request #3893 from jirikuncar/3892-macos
...
travis: run tests on macOS
2018-08-28 17:06:17 -03:00
a605ad4d11
Merge pull request #3880 from jeffreyrack/3829-progress_display_mode
...
#3829 -- Add the ability to show test progress as number of tests completed instead of a percent.
2018-08-28 16:54:14 -03:00
4b94760c8e
Removed spacing in count display.
2018-08-27 20:23:17 -07:00
82a7ca9615
Avoid possible infinite recursion when writing pyc files in assert rewrite
...
What happens is that atomic_write on Python 2.7 on Windows will try
to convert the paths to unicode, but this triggers the import of
the encoding module for the file system codec, which in turn triggers
the rewrite, which in turn again tries to import the module, and so on.
This short-circuits the cases where we try to import another file when
writing a pyc file; I don't expect this to affect anything because
the only modules that could be affected are those imported by
atomic_writes.
Fix #3506
2018-08-27 21:29:45 -03:00
29e114b463
Try to fix test in MacOS-X
2018-08-27 19:27:51 -03:00
2a059b1c1b
Merge pull request #3885 from nicoddemus/bad-output-classic
...
Fix bad console output when using console_output_style=classic
2018-08-27 19:07:02 -03:00
9620b167d9
Merge pull request #3887 from asottile/improve_test_code
...
Improve the coverage of testing/code
2018-08-27 07:20:45 -03:00
8f4685e024
Move count display style to be part of console_output_style, fixed test progress for count console output style.
2018-08-26 19:21:00 -07:00
1e8e17c01e
Improve the coverage of testing/code
2018-08-26 16:13:22 -07:00
47bb53f5cb
Cache now obeys -q when showing summary for --lf and --ff
...
Related to #3853
2018-08-26 18:08:19 -03:00
6991a16edb
Fix bad console output when using console_output_style=classic
...
Fix #3883
2018-08-26 17:12:55 -03:00
2f2d5861bb
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-08-26 16:45:00 -03:00
2577a6ce8a
Merge pull request #3873 from nicoddemus/sys-path-fix
...
Remove dangerous sys.path manipulations in test_pluginmanager
2018-08-26 08:53:57 -03:00
2a917a582e
Removing accidental change to test
2018-08-25 22:21:50 -07:00
325319dc3b
Fixing xdist test to properly configure an ini file.
2018-08-25 22:18:29 -07:00
b0541e9d31
Correctly restore sys.path in test and remove dead code in test_pytester
...
The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.
2018-08-25 18:17:52 -03:00
f872fcb5d0
Remove dangerous sys.path manipulations in test_pluginmanager
...
Noticed these while working in something else
2018-08-25 17:33:29 -03:00
de6f2c0336
Collect tests from __init__.py files if they match 'python_files'
...
Fix #3773
2018-08-25 11:18:52 -03:00
8cf0e46bbf
test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.
2018-08-24 16:23:50 -07:00
f0226e9329
Fix test_package_ordering on Windows
2018-08-24 20:15:33 -03:00
dce8df45d5
Added changelog items.
2018-08-24 15:51:42 -07:00
e3df1031ca
Add encoding: utf8 for python 2.7
2018-08-24 12:26:18 -07:00
459b040d21
Fix dedent after merge.
2018-08-24 11:54:04 -07:00
3396225f74
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
2018-08-24 11:47:24 -07:00
5fefc48f33
Fixing pre-commit hooks
2018-08-23 23:00:02 -07:00
93f783228c
Add the progress_display_mode ini option
2018-08-23 22:56:25 -07:00
5f8b50c094
Address #3796 and add a test for it.
2018-08-23 22:48:44 -07:00
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
f2e35c8c4f
Merge pull request #3859 from asottile/pyupgrade_1_4
...
Some pyupgrade 1.4.x changes
2018-08-23 18:32:53 -07:00
d10d59c013
Merge pull request #3858 from mimi1vx/test_mock
...
Use unittest.mock if is only aviable
2018-08-23 19:02:39 -03:00
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
85482d575e
Replace Source with dedent where possible
2018-08-23 09:06:17 -07:00
7099ea9bb0
py.builtin._reraise -> six.reraise
2018-08-22 23:00:58 -07:00
dccac69d82
py.builtin.text -> six.text_type
2018-08-22 23:00:06 -07:00
c2cd337886
py.builtin.exec_ => six.exec_
2018-08-22 23:00:06 -07:00
0fc4a806e5
py.builtins._totext -> string literals or six.text_type
2018-08-22 23:00:04 -07:00
4d3c1ab4f0
Fixes #3854
2018-08-22 21:42:59 -07:00
8bb8b91357
pyupgrade 1.4: tests
2018-08-22 18:47:21 -07:00
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
b08e156b79
strip trailing whitespace
2018-08-22 11:27:36 -05:00
8e2c7b4979
Add a failing testcase for PR #3848
2018-08-22 11:00:51 -05:00
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
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
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
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
044d2b8e6e
Merge pull request #3838 from wimglenn/runresult_xfail
...
Support xfailed and xpassed outcomes in RunResult.
2018-08-20 20:01:51 -03:00
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
70ebab3537
Renamed snap_global_capture to read_global_capture.
2018-08-20 17:48:14 +02:00
d611b03589
Parametrized tests for capfd as well. Separated global capture test.
2018-08-20 12:23:59 +02:00
539a22c750
Added support for xfailed and xpassed outcomes to the ``pytester.RunResult.assert_outcomes`` signature.
2018-08-20 01:24:19 -05:00
7ea4992f16
Fixed linting.
2018-08-19 15:46:02 +02:00
0564b52c0e
Fixed integration with other modules/tests
2018-08-19 15:26:57 +02:00
9e382e8d29
Fixed test.
2018-08-19 14:29:57 +02:00
2255892d65
Improved test to cover more cases.
2018-08-19 13:44:12 +02:00
c64a8c9c7f
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-08-18 15:54:53 -03:00
f4c5994d27
Fixtures during teardown can use capsys and capfd to get output from tests
...
Fix #3033
2018-08-18 14:46:24 -03:00
c24c7e75e2
Added regression test for capfd in a fixture
2018-08-18 14:11:04 -03:00
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
090f67a980
Refactored implementation and updated tests.
2018-08-17 13:41:26 +02:00
3059bfb1b3
Update test with another problem.
2018-08-17 13:00:27 +02:00
e391c47ed8
Update capture suspend test for logging.
2018-08-17 00:44:15 +02:00
da9d814da4
Added test.
2018-08-17 00:20:51 +02:00
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
939a792c41
Merge pull request #3798 from jonozzz/fix-3751
...
Fix #3751
2018-08-16 06:52:16 +02:00
17644ff285
Fix traceback reporting for exceptions with `__cause__` cycles.
2018-08-15 18:15:07 -07:00
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
212ee450b7
simplified test function
2018-08-14 20:29:42 -05:00
6367f0f5f1
fix `filterwarnings` mark not registered
2018-08-14 16:13:15 -05:00
e92893ed24
Add test for packages mixed with modules.
2018-08-10 17:29:30 -07:00
27b5435a40
Fix docs formatting and improve test a bit
2018-08-10 18:19:07 -03:00
50db718a6a
Add a test description.
2018-08-10 13:57:29 -07:00
266f05c4c4
Fix #3751
2018-08-09 18:28:22 -07:00
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
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
051db6a33d
Trimming Trailing Whitespace
2018-08-08 18:18:18 -05:00
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
126896f69d
Add option to disable plugin auto-loading
...
If `PYTEST_DISABLE_PLUGIN_AUTOLOAD` is set, disable auto-loading of
plugins through setuptools entrypoints. Only plugins that have been
explicitly specified are loaded.
ref #3784 .
2018-08-07 13:16:28 -04:00
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
2c0d2eef40
Only consider actual functions when considering hooks
...
Fix #3775
2018-08-04 16:37:07 -03:00
ef8ec01e39
Fix issue where fixtures would lose the decorated functionality
...
Fix #3774
2018-08-04 15:14:00 -03:00
dcafb8c48c
Add example for package recursion bug
2018-08-03 15:40:33 -03:00
ca0476953e
Merge pull request #3751 from nicoddemus/collect-file-bug
...
Workaround for #3742
2018-08-02 07:35:46 +02:00
7e92930fa9
Merge pull request #3764 from asottile/fix_3763
...
Fix `TypeError` when the assertion message is `bytes` in python 3.
2018-08-02 07:19:51 +02:00
33769d0328
Merge pull request #3754 from nicoddemus/fix-function-call-warning
...
Refactor direct fixture call warning to avoid incompatibility with plugins
2018-08-02 07:17:15 +02:00
804fc4063a
Merge pull request #3741 from kalekundert/approx_misc_tweaks
...
Miscellaneous improvements to approx()
2018-08-01 23:40:21 -03:00
452e5c1cf0
Fix `TypeError` when the assertion message is `bytes` in python 3.
2018-08-01 15:09:25 -07:00
c6b11b9f62
Refactor direct fixture call warning to avoid incompatibility with plugins
...
This refactors the code so we have the real function object right during
collection. This avoids having to unwrap it later and lose attached information
such as "async" functions.
Fix #3747
2018-08-01 16:38:43 -03:00
43664d7841
Use ids for parametrized values in test_expected_value_type_error
2018-08-01 07:34:08 -03:00
6e32a1f73d
Use parametrize in repr test for nd arrays
2018-08-01 07:04:25 -03:00
fcdc1d867e
fix #3745 - display absolute cache_dir if necessary
2018-08-01 08:25:37 +02:00
8c9efd8608
Only call _collectfile on package instances
...
As discussed in #3751 , this feels like a hack, pushing it only so we can
see how it fares on CI and if there are better solutions out there
2018-07-31 19:06:30 -03:00
e1ad1a14af
Add example script and failure for #3742
2018-07-31 17:50:55 -03:00
Ronny Pfannschmidt
Anthony Sottile
Bruno Oliveira
Daniel Hahler
Thomas Hisch
Andrea Cimatoribus
Ronny Pfannschmidt
CrazyMerlyn
dhirensr
Steve Piercy
Jeffrey Rackauckas
turturica
wim glenn
Ondřej Súkup
Sankt Petersbug
Victor
wim glenn
Tyler Richard
Wes Thomas
Virgil Dupras