floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,297 Commits 32 Branches 205 Tags 46 MiB
Commit Graph

2372 Commits

Author SHA1 Message Date
Ran Benita b90f34569f nodes: micro-optimize Node attribute access 2020-05-06 11:58:30 +03:00
Ran Benita 5702c86f4c nodes: micro-optimize hash(node) 
Turns out it's called alot, and saving the function call makes it
faster.
 2020-05-06 11:58:30 +03:00
Ran Benita fcc473ab1c Use dict instead of OrderedDict on Python 3.7 
OrderedDict is quite a bit heavier than just a dict.
 2020-05-06 11:58:28 +03:00
Ran Benita 69143fe5b0 code: fix import cycles between code.py and source.py 
These two files were really intertwined. Make it so code.py depends on
source.py without a reverse dependency.

No functional changes.
 2020-05-06 11:01:32 +03:00
Bruno Oliveira d0022b5a13 'saferepr' handles classes with broken __getattribute__ 
Fix #7145
 2020-05-05 19:22:39 -03:00
Ran Benita 94400a68b4 terminal: fix non-deterministic warning summary order in Python 3.5 
In Python 3.5, collections.Counter() does not preserve insertion order.
 2020-05-05 23:08:44 +03:00
Ran Benita 4b91617002
Merge pull request #7020 from blueyed/fix-warnings-summary 
Fix warnings summary
 2020-05-05 21:58:57 +03:00
Ran Benita b4be6cd4b7
Merge pull request #6765 from blueyed/capture-refactor-1 
Refactor Capture classes: move/rename CaptureIO classes
 2020-05-05 21:46:18 +03:00
Daniel Hahler 8cae78a18b Fix warnings summary 
- replace "tests with warnings" with just warnings: they a) might not
  come from a test in the first place, and b) a single test might have
  multiple warnings.
- fix usage of (unused) argument to `collapsed_location_report`

Co-authored-by: Ran Benita <ran@unusedvar.com>
 2020-05-05 21:40:34 +03:00
Ran Benita d7d627b1e8
Merge pull request #7064 from blueyed/fix-_printcollecteditems-doc-upstream 
Fix/improve printing of docs for collected items
 2020-05-05 21:31:21 +03:00
Daniel Hahler 7647d1c836 Move Capture classes from compat to capture and improve naming 
Move {Passthrough,CaptureIO} to capture module, and rename Passthrough
-> Tee to match the existing terminology.

Co-authored-by: Ran Benita <ran@unusedvar.com>
 2020-05-05 21:24:59 +03:00
Ran Benita 46d768503e
Merge pull request #6839 from blueyed/typing-get_dirs_from_args-parseconfig 
typing: get_dirs_from_args, parseconfig
 2020-05-05 21:11:26 +03:00
Ran Benita 85732e2b08
Merge pull request #6993 from blueyed/doc-pytest_collection-upstream 
[WIP] doc: pytest_collection: has to set `session.items`
 2020-05-05 21:05:56 +03:00
Bruno Oliveira 16a44823eb Use reportinfo() instead of location in skipping message 2020-05-04 19:50:40 -03:00
Katarzyna 402ee6fb9d Relative path to invocationdir instead rootdir. 2020-05-03 22:56:38 +02:00
Bruno Oliveira 80e5098408
Merge pull request #7155 from kerizane/make_numbered_dir 2020-05-03 09:48:36 -03:00
Keri Volans 678440e46d 7018: Use internal version of make_numbered_dir 2020-05-03 10:45:06 +01:00
Bruno Oliveira 5c2e96c0e6 Fix cleanup functions not being invoked on test failures 
Also delay calling tearDown() when --pdb is given, so users still have
access to the instance variables (which are usually cleaned up during tearDown())
when debugging.

Fix #6947
 2020-05-02 15:26:55 -03:00
Bruno Oliveira 2b51ed46d5
Merge pull request #7153 from nicoddemus/xunit-warning-update 2020-05-02 13:31:34 -03:00
Bruno Oliveira 095a195d71 Improve docs about junit_family warning message 
From discussion in #6178
 2020-05-02 13:01:15 -03:00
Bruno Oliveira 0b78983197
Merge pull request #7141 from bluetech/rm-nonzero 2020-05-02 10:00:35 -03:00
Bruno Oliveira e3643751bc
Merge pull request #7144 from nicoddemus/async-testcase-7110 2020-05-01 16:44:10 -03:00
Bruno Oliveira fd2f172258 Let unittest frameworks deal with async functions 
Instead of trying to handle unittest-async functions in pytest_pyfunc_call,
let the unittest framework handle them instead.

This lets us remove the hack in pytest_pyfunc_call, with the upside that
we should support any unittest-async based framework.

Also included 'asynctest' as test dependency for py37-twisted, and renamed
'twisted' to 'unittestextras' to better reflect that we install 'twisted' and
'asynctest' now.

This also fixes the problem of cleanUp functions not being properly called
for async functions.

Fix #7110
Fix #6924
 2020-05-01 15:10:28 -03:00
Bruno Oliveira 7f5978c34c Allow File.from_parent to forward custom parameters to the constructor 2020-05-01 11:00:52 -03:00
Ran Benita a718ad6363 Stop using Python's eval() for -m and -k 
Previously, the expressions given to the `-m` and `-k` options were
evaluated with `eval`. This causes a few issues:

- Python keywords cannot be used.

- Constants like numbers, None, True, False are not handled correctly.

- Various syntax like numeric operators and `X if Y else Z` is supported
  unintentionally.

- `eval()` is somewhat dangerous for arbitrary input.

- Can fail in many ways so requires `except Exception`.

The format we want to support is quite simple, so change to a custom
parser. This fixes the issues above, and gives us full control of the
format, so can be documented comprehensively and even be extended in the
future if we wish.
 2020-05-01 12:59:06 +03:00
Ran Benita 409ffcef17 Remove a couple Python 2 __nonzero__ definitions 
It's called __bool__ in Python 3.
 2020-05-01 11:41:21 +03:00
Ran Benita d8558e87c5 terminalwriter: clean up markup function a bit 2020-04-30 16:44:03 +03:00
Ran Benita 414a87a53f config/argparsing: use our own get_terminal_width() 2020-04-30 16:44:03 +03:00
Ran Benita d5584c7207 terminalwriter: compute width_of_current_line lazily 
Currently this property is computed eagerly, which means
get_line_width() is computed on everything written, but that is a slow
function.

Compute it lazily, so that get_line_width() only runs when needed.
 2020-04-30 16:44:03 +03:00
Ran Benita dd32c72ff0 terminalwriter: remove unused property chars_on_current_line 2020-04-30 16:44:03 +03:00
Ran Benita 1bc4170e63 terminalwriter: don't flush implicitly; add explicit flushes 
Flushing on every write is somewhat expensive.

Rely on line buffering instead (if line buffering for stdout is
disabled, there must be some reason...), and add explicit flushes when
not outputting lines.

This is how regular `print()` e.g. work so should be familiar.
 2020-04-30 16:44:03 +03:00
Ran Benita d9b43647b7 terminalwriter: inline function _update_chars_on_current_line 2020-04-30 16:44:03 +03:00
Ran Benita 8e04d35a33 terminalwriter: remove unneeded hasattr use 2020-04-30 16:44:03 +03:00
Ran Benita e8fc5f99fa terminalwriter: add type annotations 2020-04-30 16:44:03 +03:00
Ran Benita f6564a548a terminalwriter: remove win32 specific code in favor of relying on colorama 
On Windows we already depend on colorama, which takes care of all of
this custom code on its own.
 2020-04-30 16:44:03 +03:00
Ran Benita 8d2d1c40f8 terminalwriter: inline function _escaped 
Doesn't add much.
 2020-04-30 16:44:03 +03:00
Ran Benita 66ee755649 terminalwriter: remove TerminalWriter's stringio argument 
Had a mark indicating it should be removed, and I agree, it's better to
just use the `file` argument.
 2020-04-30 16:44:02 +03:00
Ran Benita 94a57d2353 io: combine _io.TerminalWriter and _io.terminalwriter.TerminalWriter 
Previously it extended an external type but now it come move to the type
itself.
 2020-04-30 16:44:02 +03:00
Ran Benita dac05ccd9a terminalwriter: remove support for passing callable as file in TerminalWriter 
Not used.
 2020-04-30 16:44:02 +03:00
Ran Benita 0528307ebf terminalwriter: remove unused function TerminalWriter.reline 2020-04-30 16:44:02 +03:00
Ran Benita a6819726cd terminalwriter: remove unused function ansi_print 2020-04-30 16:44:02 +03:00
Ran Benita b6cc90e0af terminalwriter: remove support for writing bytes directly 
It is not used and slows things down.
 2020-04-30 16:44:02 +03:00
Ran Benita 9a59970cad terminalwriter: optimize get_line_width() a bit 
This function is called a lot when printing a lot of text, and is very
slow -- this speeds it up a bit.
 2020-04-30 16:44:02 +03:00
Ran Benita 6c1b6a09b8 terminalwriter: simplify get_terminal_width() 
The shutil.get_terminal_size() handles everything this did already.
 2020-04-30 16:44:02 +03:00
Ran Benita c749e44efc terminalwriter: remove custom win32 screen width code 
Python 3 does this on its own so we can use the shared code:
bcf2b59fb5
 2020-04-30 16:44:02 +03:00
Ran Benita 1d596b27a7 terminalwriter: move Win32ConsoleWriter definition under win32 conditional 
This way non-Windows platforms skip it. It also uses things defined
inside the `if`.
 2020-04-30 16:44:02 +03:00
Ran Benita 5e2d820308 terminalwriter: fix lints 2020-04-30 16:44:02 +03:00
Ran Benita 3014d9a3f7 terminalwriter: auto-format 2020-04-30 16:43:55 +03:00
Ran Benita 276405a039 terminalwriter: vendor TerminalWriter from py 
Straight copy from py 1.8.1. Doesn't pass linting yet.
 2020-04-30 16:43:54 +03:00
Ran Benita c72a1b2933 config: replace usage of py.io.dupfile 
As part of the effort to remove uses of `py`.
 2020-04-29 18:04:37 +03:00
Ran Benita e5d6e58625
Merge pull request #7130 from bluetech/cacheprovider-nf-set 
cacheprovider: speed up NFPlugin when --nf is not enabled
 2020-04-29 17:28:20 +03:00
Ran Benita 4a42afdc2f cacheprovider: speed up NFPlugin when --nf is not enabled 
The code used an O(n^2) loop. Replace list with set to make it O(n).

For backward compatibility the filesystem cache still remains a list.

On this test:

    import pytest
    @pytest.mark.parametrize("x", range(5000))
    def test_foo(x): pass

run with `pytest --collect-only`:

Before: 0m1.251s
After:  0m0.921s
 2020-04-29 13:02:38 +03:00
Ran Benita 9bf3efb8e9
Merge pull request #7120 from bluetech/update-dev 
pre-commit: update some tool revisions
 2020-04-25 23:07:15 +03:00
Ran Benita 3cd97d50f9 pre-commit: update pyupgrade 1.18.0 -> 2.2.1 2020-04-24 21:57:38 +03:00
Ran Benita 38c9d59ddc pre-commit: update blacken-docs 1.0.0 -> 1.6.0 2020-04-24 21:53:37 +03:00
Ran Benita 289e6c1d36
Update src/_pytest/deprecated.py 
Co-Authored-By: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
 2020-04-24 21:37:08 +03:00
Ran Benita 907e29a47b fixtures: deprecate pytest._fillfuncargs function 
This function is exposed and kept alive for the oejskit plugin which is
abandoned and no longer works with recent plugins, so let's prepare to
completely remove it.
 2020-04-24 18:54:46 +03:00
Ran Benita 7d5f5a8785
Merge pull request #7050 from blueyed/fix-doc 
doc: internal: remove references to old "newinterpret" module
 2020-04-17 17:11:31 +03:00
Ran Benita 731c340be6
Merge pull request #7058 from blueyed/doc-store 
doc: minor fixes for Store
 2020-04-17 17:10:35 +03:00
Katarzyna Król 7789b51acb
Issue 4677 - always relative path in skip report (#6953) 2020-04-17 08:28:36 +03:00
Simon K de6c28ed1f
Improve error handling around yieldctx fixtures which do not yield a value (#7083) 2020-04-15 12:17:13 +03:00
Ran Benita 9ddf38369d
Merge pull request #7069 from bluetech/faulthandler-doc-windows 
Remove note saying faulthandler_timeout is not available on Windows
 2020-04-14 10:24:28 +03:00
Simon K f479cbce10
Document pytester fixtures so --fixtures makes more sense (#7080) 2020-04-13 20:58:50 +03:00
Ran Benita c08cff3770
Merge pull request #7082 from symonk/4583-better-ux-with-eval-fails 
Gracefully handle eval() failure(s) for marker expressions
 2020-04-13 17:03:37 +03:00
symonk 251e8f212e refactor mark tests, widen catching and make error msg more concise 2020-04-13 14:25:01 +01:00
symonk 87edc09dea Gracefully handle eval() failure(s) for marker expressions 2020-04-13 13:25:06 +01:00
Andreas Maier c9386ada29 Squash: Resolved 2nd round of review comments 2020-04-12 13:19:45 +02:00
Andreas Maier b2582b0314 Squash: Applied review comments 2020-04-12 12:12:00 +02:00
Andreas Maier 869c089887 Fixes #7077: Added & improved docs for repr_failure() in Node & Collector 2020-04-12 09:28:40 +02:00
Ran Benita b553ce54c8 Remove note saying faulthandler_timeout is not available on Windows 
I think it is available in all Python versions we support, but at least
since Python 3.7 the docs[0] say:

    Changed in version 3.7: This function is now always available.

so let's just remove the note.

[0] https://docs.python.org/3/library/faulthandler.html#faulthandler.dump_traceback_later
 2020-04-10 14:46:15 +03:00
Ronny Pfannschmidt 244c8e4a13
Merge pull request #6680 from RonnyPfannschmidt/fix-6294-more-docs-for-fromparent 
doc: more docs for from_parent
 2020-04-10 13:10:40 +02:00
Ronny Pfannschmidt 19c243f0fa
Merge pull request #6285 from earonesty/patch-1 
Add _pytest.fixtures.FixtureLookupError to top level import
 2020-04-10 07:58:58 +02:00
Ronny Pfannschmidt c5d636a1b2
Merge pull request #6992 from pytest-dev/revert-6767-tmpdir-cleanup-upstream 
Revert "tmpdir: clean up indirection via config for factories"
 2020-04-10 07:49:52 +02:00
Ronny Pfannschmidt 1eb2b45db5 Revert "tmpdir: clean up indirection via config for factories (#6767)" 
This reverts commit 8a1633c3b4.

+ add changelog
 2020-04-10 07:18:54 +02:00
Daniel Hahler 0b5d2ff526 Fix/improve printing of docs for collected items 2020-04-09 21:49:30 +02:00
Daniel Hahler accea46fa1 doc: minor fixes for Store 2020-04-09 17:08:47 +02:00
Daniel Hahler 413ca8a4d0
faulthandler: trylast=True (#7025) 
It should happen as late as possible before the test runs.

Ref: https://github.com/pytest-dev/pytest/issues/7022
 2020-04-09 08:53:35 +02:00
Daniel Hahler a98a62723e revisit 2020-04-09 01:57:46 +02:00
Daniel Hahler ad4c1071d9 doc: internal: remove references to old "newinterpret" module 
This has been merged into the (only) assertrewrite mode.
 2020-04-09 01:40:23 +02:00
Ran Benita 4344c61731 Slightly improve Mark and MarkDecorator documentation 
Mostly I wanted to get rid of mentions of "MarkItem" which is something
that no longer exists, but I improved a little beyond that and annotated
some simple types.
 2020-04-07 22:14:47 +03:00
Daniel Hahler ce806001b0
Fix doc for `numbered` arg with `TempPathFactory.mktemp` (#7014) 2020-04-07 11:44:54 +02:00
Ran Benita 259e5d0610
Merge pull request #7034 from bluetech/fix-testdurations-flaky 
Fix flaky TestDurations test
 2020-04-07 09:39:02 +03:00
Daniel Hahler 1fd14685c5
doc: document inversed lines with terminal report hooks (#7016) 
It was surprising that `tryfirst=True` would not result in lines being
added to the beginning with `pytest_report_header`.
This is due to lines being reversed, and therefore the same applies to
`pytest_report_collectionfinish`.
 2020-04-07 08:08:28 +02:00
Ran Benita c3e6e2e8c8 Fix flaky TestDurations test 
TestDurations tests the `--durations=N` functionality which reports N
slowest tests, with durations <= 0.005s not shown by default.

The test relies on real time.sleep() (in addition to the code which uses
time.perf_counter()) which makes it flaky and inconsistent between
platforms.

Instead of trying to tweak it more, make it use fake time instead. The
way it is done is a little hacky but seems to work.
 2020-04-06 23:49:46 +03:00
Ran Benita 1ce30fd38f Document the pytest_report_teststatus hook better and test uncovered functionality 
This hook has some functionality to provide explicit markup for the test
status. It seemed unused and wasn't tested, so I was tempted to remove
it, but I found that the pytest-rerunfailures plugin uses it, so
document it and add a test instead.
 2020-04-04 17:27:59 +03:00
Ran Benita 4a324ce920 Remove unused defaultfuncargprefixmarker 
Unused since 1e80a9cb34.
 2020-04-04 14:34:40 +03:00
Daniel Hahler 20f6331afd
Fix TerminalRepr instances to be hashable (#6988) 
pytest-xdist assumes `ExceptionChainRepr` is hashable.

Fixes https://github.com/pytest-dev/pytest/issues/6925.
Fixes https://github.com/pytest-dev/pytest-xdist/issues/515.
 2020-04-03 00:56:53 +02:00
Ran Benita 03451c397f Simplify positional arguments compatibility code in pytest.fixture() 
The dynamic scope feature added in 10bf6aac76
necessitated some wrangling of arguments in pytest.fixture(). In
particular, it deprecated positional arguments in favor of keyword-only
arguments, while keeping backward compatibility.

The way it did this avoided some code duplication but ended up being
quite hard to follow and to annotate with types.

Replace it with some straightforward code, which is not very DRY but is
simple and easy to remove when the time comes.
 2020-04-02 14:52:58 +03:00
Daniel Hahler 354602abe6
Update src/_pytest/hookspec.py 
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2020-04-02 12:01:43 +02:00
Daniel Hahler 607f7603af doc: pytest_collection: has to set `session.items` 
Would make sense to use its return value etc, but this helps for now.
 2020-03-31 09:39:50 +02:00
Ronny Pfannschmidt 2d9dac95ec
Merge pull request #6927 from RonnyPfannschmidt/fix-6924-run-async-stdlib-unittests 
running stdlib asyncio unittests again
 2020-03-30 22:34:17 +02:00
Ronny Pfannschmidt 451aef65ac prepare tests and disable warnings for asyncio unittest cases 
shoehorn unittest async results into python test result interpretation

changelog
 2020-03-30 21:55:12 +02:00
Ronny Pfannschmidt f1d51ba1f5 deprecate the pytest.collect module 
changelog

minimal unittest for collect module deprecations

\!fixup - changelog typo
 2020-03-30 21:53:07 +02:00
Ronny Pfannschmidt eab2831671 fix #6951: allow to write TerminalReporter.writer 2020-03-30 21:31:53 +02:00
smarie 95fadd5740
Improved time counter used to compute test durations. (#6939) 
Co-authored-by: Sylvain MARIE <sylvain.marie@se.com>
Co-authored-by: Ran Benita <ran@unusedvar.com>
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-03-29 15:20:09 +03:00
Ran Benita a785754523 Change EnvironmentError, IOError to OSError - they are aliases 
Since Python 3.3, these are aliases for OSError:
https://docs.python.org/3/whatsnew/3.3.html#pep-3151-reworking-the-os-and-io-exception-hierarchy
 2020-03-27 18:40:23 +03:00
Ran Benita 83e18776f6
Merge pull request #6818 from blueyed/fix-assert-exc-upstream 
assertion: rewrite: only catch EnvironmentError
 2020-03-27 18:33:17 +03:00
Bruno Oliveira 429a28eca0
Merge pull request #6782 from nicoddemus/code-highlight-followup 
Assorted improvements following up #6658
 2020-03-27 08:58:50 -03:00
Daniel Hahler aae0579bcd
doc: use `envvar` directive for environment variables (#6874) 
This changes the link anchors in "reference.html", from e.g.
`reference.html#pytest-current-test` to
`reference.html#envvar-PYTEST_CURRENT_TEST`, but I think that is OK, and
not worth adding labels for the old anchors.
 2020-03-27 02:40:25 +01:00
Daniel Hahler 327ec54248
Doc fixes (#6861) 2020-03-27 02:22:03 +01:00
Ran Benita 817537523c Upgrade mypy 0.761 -> 0.770 
https://mypy-lang.blogspot.com/2020/03/mypy-0770-released.html
 2020-03-21 17:16:30 +02:00
Ran Benita ded30238f7
Merge pull request #6926 from bluetech/fix-capsysbin-print 
Fix crash when printing while capsysbinary is active
 2020-03-17 11:21:19 +02:00
Daniel Hahler 1fda861190 Fix crash when printing while capsysbinary is active 
Previously, writing to sys.stdout/stderr in text-mode (e.g.
`print('foo')`) while a `capsysbinary` fixture is active, would crash
with:

    /usr/lib/python3.7/contextlib.py:119: in __exit__
        next(self.gen)
    E   TypeError: write() argument must be str, not bytes

This is due to some confusion in the types. The relevant functions are
`snap()` and `writeorg()`. The function `snap()` returns what was
captured, and the return type should be `bytes` for the binary captures
and `str` for the regular ones. The `snap()` return value is eventually
passed to `writeorg()` to be written to the original file, so it's input
type should correspond to `snap()`. But this was incorrect for
`SysCaptureBinary`, which handled it like `str`.

To fix this, be explicit in the `snap()` and `writeorg()`
implementations, also of the other Capture types.

We can't add type annotations yet, because the current inheritance
scheme breaks Liskov Substitution and mypy would complain. To be
refactored later.

Fixes: https://github.com/pytest-dev/pytest/issues/6871
Co-authored-by: Ran Benita (some modifications & commit message)
 2020-03-16 18:21:33 +02:00
Ran Benita c26bbdfaf0
Merge pull request #6854 from gdhameeja/Fix-6822 
Check invalid operations for -k
 2020-03-15 09:53:36 +02:00
Ran Benita 29e4cb5d45 Remove safe_text_dupfile() and simplify EncodedFile 
I tried to understand what the `safe_text_dupfile()` function and
`EncodedFile` class do. Outside tests, `EncodedFile` is only used by
`safe_text_dupfile`, and `safe_text_dupfile` is only used by
`FDCaptureBinary.__init__()`. I then started to eliminate always-true
conditions based on the single call site, and in the end nothing was
left except of a couple workarounds that are still needed.
 2020-03-14 12:57:08 +02:00
Bruno Oliveira 010e711971 Merge pull request #6914 from nicoddemus/revert-6330 
Revert "[parametrize] enforce explicit argnames declaration (#6330)"
 2020-03-13 10:49:48 -03:00
Bruno Oliveira 2eedf9c2aa
Merge pull request #6910 from nicoddemus/resultlog-logreport 
Handle unknown stats in pytest_report_teststatus hook
 2020-03-13 09:30:04 -03:00
Bruno Oliveira 0c58ed2cc0 Handle unknown stats in pytest_report_teststatus hook 
Noticed that the pytest_report_teststatus of reportlog was not properly
handling unknown statuses while taking a look at:

https://github.com/pytest-dev/pytest-rerunfailures/issues/103
 2020-03-12 20:52:22 -03:00
Ran Benita 6954b3b0dc Assume os.dup is always available 
The commit which added the checks for os.dup a15afb5e48
suggests it was done for Jython. But pytest doesn't support Jython
anymore (Jython is Python 2 only).

Furthermore, it looks like the faulthandler plugin (bundled in pytest
and enabled by default) uses os.dup() unprotected and there have not
been any complaints.

So seems better to just remove these checks, and only add if someone
with a legitimate use case complains.
 2020-03-12 16:47:15 +02:00
Ran Benita 4f8fff9cab
Merge pull request #6868 from bluetech/simplify-exc 
Simplify some exception handling code
 2020-03-10 20:32:08 +02:00
Daniel Hahler ac7ebfa22e
doc: internal: fix `MultiCapture.readouterr` (#6878) 
Remove wrong docstring: it might actually return bytes.
Replace it with a type annotation which is clear enough.
 2020-03-08 12:38:21 +01:00
Daniel Hahler db92cea14c
black: --target-version py35 (#6872) 2020-03-08 01:24:31 +01:00
Daniel Hahler bce1d40fb0
tests: harden test_reprcompare_notin, factor out callop (#6764) 
* tests: assertion: factor out `callop`, typing

* tests: harden test_reprcompare_notin
 2020-03-08 01:23:19 +01:00
Daniel Hahler dc86fb6758 pre-commit run --all-files 2020-03-07 23:47:55 +01:00
gdhameeja 599bf075db Check invalid operations for -k 
`KeywordMapping` returns a bool on lookup which when passed to eval
fail on certain operations such as index access and attribute access.
We catch all exceptions and raise a `UsageError`.
 2020-03-07 20:17:01 +05:30
Ran Benita 978b315861 Simplify some exception handling code 
Mostly avoid unnecessary usage of sys.exc_info(). Since Python3,
exception objects themselves have all that's needed. They are also
easier to type.
 2020-03-07 13:18:54 +02:00
Ran Benita 580edc13e7
Merge pull request #6867 from bluetech/inline-pyobjmixin 
Inline PyobjContext
 2020-03-07 11:58:38 +02:00
Ran Benita b7f2e3d4f5 Inline PyobjContext 
When it was introduced in 8adac2878f it
seems to have had some use, but now it doesn't.
 2020-03-06 14:55:20 +02:00
Ran Benita f011bc642c Store mark's evalcache in config's store instead of attribute 
Part of moving away from ad-hoc attributes to using the config's store.
 2020-03-06 11:42:20 +02:00
Ran Benita b1d7a187f2 Add setdefault() method to Store 
Can be useful in some cases.
 2020-03-06 11:42:20 +02:00
Ran Benita 678d65f051 Store AssertionState in config's store instead of attribute 
Part of moving away from ad-hoc attributes to using the config's store.
 2020-03-06 11:27:01 +02:00
Daniel Hahler fcd3fad03d
Minor internal improvements to logging's log_level (#6849) 2020-03-06 03:12:57 +01:00
Bruno Oliveira 19bb2c6235
Merge pull request #6859 from nicoddemus/kw-mapping-attr-typing 
Use attrs in KeywordMapping
 2020-03-05 08:47:22 -03:00
Bruno Oliveira bc8e52c3c2 Use attrs in KeywordMapping 
Also added type hinting.
 2020-03-05 08:33:20 -03:00
Daniel Hahler d9a4626944 fixup! Fix documentation for Config/InvocationParams 2020-03-05 06:38:44 +01:00
Daniel Hahler ffa2658971 doc: reports: count_towards_summary: is a property 
And therefore does not really `return`.  It confused me that there was
no `source` link in the docs, which is only there for functions.
 2020-03-05 05:57:43 +01:00
Daniel Hahler c39a85e5f4 doc: revisit UnformattedWarning 2020-03-05 03:15:14 +01:00
Daniel Hahler b90f57d25c Remove wrong/outdated doc with UnformattedWarning 
It was introduced in da6830f19 (added to `_pytest.deprecated`, but then
moved to `_pytest.warning_types`).
 2020-03-05 03:13:28 +01:00
Daniel Hahler 77adb33ec6 doc: use show-inheritance with warnings, revisit docstrings 
Revisits the docstring for `PytestExperimentalApiWarning` and
`PytestUnhandledCoroutineWarning`.
 2020-03-05 02:56:18 +01:00
Daniel Hahler 1a8d427e98 doc: src/_pytest/deprecated.py: links 2020-03-05 02:47:21 +01:00
Kyle Altendorf dce2621710
Add pytest-twisted to list of async def handling plugins 
https://github.com/pytest-dev/pytest-twisted/tree/v1.12#ensuredeferred

[pytest-twisted](https://github.com/pytest-dev/pytest-twisted) supports `async def` test functions and fixtures as well as `async def`/`yield` fixtures.
 2020-03-04 17:42:08 -05:00
Daniel Hahler acec0b688f
Fix usage of pytester with doctests (#6802) 
Use `request.node.name` instead of `request.function.__name__`:
`request.function` is `None` with `DoctestItem`s.
 2020-03-04 05:33:50 +01:00
Daniel Hahler 37d074efc8
Fix (internal) documentation for pytester's LineComp (#6850) 2020-03-04 05:25:32 +01:00
Ronny Pfannschmidt 9fd71d6fe0
fix #571: deprecate pytest_collect_directory as ... (#6847) 
Deprecate pytest_collect_directory

Fix #571

Co-authored-by: Daniel Hahler <github@thequod.de>
 2020-03-03 18:58:14 -03:00
Daniel Hahler b11bfa106c
Use attrs with all Repr classes (#6739) 
Co-authored-by: Ran Benita <ran234@gmail.com>
 2020-03-03 21:53:28 +01:00
Daniel Hahler dc5219a9c0 Fix documentation for Config/InvocationParams 2020-03-03 21:15:06 +01:00
Daniel Hahler a42e85ed54 Fix documentation for _pytest.pytester.RunResult 
When using `(i)var` in the class docstring it would link `duration` to
`_pytest.runner.TestReport.duration`.

This moves the docstrings to the attributes properly.
 2020-03-03 18:12:12 +01:00
Bruno Oliveira aac11e5e75 Mention FixtureLookupError in getfixturevalue docs 2020-03-03 10:05:19 -03:00
earonesty b2d54fe6b1 Fix tox alpha order 2020-03-03 09:59:38 -03:00
earonesty 9b8ed8d9ad Update pytest.py 2020-03-03 09:59:38 -03:00
earonesty b40a9f9add Export FixtureLookupError to top level 2020-03-03 09:59:38 -03:00
Daniel Hahler ddc8edffbc logging: minor typing, rename function 
`get_log_level_for_setting` reflects better what the function does, and
it does not require a (trivial) docstring.
 2020-03-01 22:02:46 +01:00
Daniel Hahler bdd22fdd52 logging: improve help for log_level 2020-03-01 22:02:46 +01:00
Ronny Pfannschmidt 3d390940d1 refer the node-from-parent deprecation documentation in the warning 
fixup: fix test for warning
 2020-03-01 20:33:46 +01:00
Ronny Pfannschmidt 194b52145b
Merge pull request #6834 from RonnyPfannschmidt/fix-6833-summarize-warning-item-locations 
summarize warning summaries if the number of locations is high
 2020-03-01 20:21:36 +01:00
Ronny Pfannschmidt 23c43a37e0 summarize warning summaries if the number of locations is high 2020-03-01 14:08:15 +01:00
Bruno Oliveira 92767fec51
Merge pull request #6836 from bluetech/store 
Add a typing-compatible mechanism for ad-hoc attributes on various objects
 2020-03-01 09:30:10 -03:00
Ran Benita 2f60548e08 Mark AssertionRewritingHook as implementing importlib.abc.Loader 
It implements the required methods. This is useful for typing but also a
nice indicator.
 2020-02-29 16:55:56 +02:00
Daniel Hahler f10ab021e2
Move _collectfile to FSCollector (#6830) 
Previously this was implemented both on `Session` and `Package`, where
the extra code in `Package._collectfile` was not covered/used.

Ref: https://github.com/pytest-dev/pytest/pull/6830#issuecomment-592663236
 2020-02-29 11:40:11 +01:00
Daniel Hahler d99bfc18b8
Update src/_pytest/config/findpaths.py 
Co-Authored-By: Ran Benita <ran234@gmail.com>
 2020-02-29 11:39:33 +01:00
Bruno Oliveira ff7b5dbbde
Merge pull request #6784 from nicoddemus/deprecate-terminal-writer 
Deprecate TerminalReporter.writer
 2020-02-28 21:07:02 -03:00
Daniel Hahler 6092d3c6e1 typing: parseconfig 2020-02-28 20:40:39 +01:00
Daniel Hahler d2f9a73a29 typing: get_dirs_from_args 2020-02-28 19:58:15 +01:00
Daniel Hahler 5819536f00
Improve UsageError with invalid `-o` style (#6795) 
This started from fixing the test, where `"xdist_strict True"` was used
as a single argument, although you typically would see `["xdist_strict",
"True"]`.

Improves the error message to mention the option that caused the error.
 2020-02-28 19:41:56 +01:00
Ran Benita d636fcd557 Add a typing-compatible mechanism for ad-hoc attributes on various objects 
pytest has several instances where plugins set their own attributes on
objects they receive in hooks, like nodes and config. Since plugins are
detached from these object's definition by design, this causes a problem
for type checking because these attributes are not defined and mypy
complains.

Fix this by giving these objects a "store" which can be used by plugins
in a type-safe manner.

Currently this mechanism is private. We can consider exposing it at a
later point.
 2020-02-28 14:34:44 +02:00
Daniel Hahler 16c683dff9
Remove unused `setns` (#6804) 
Last usage of it was removed in ba17363d7.
 2020-02-26 15:35:14 +01:00
Daniel Hahler eac933acde assertion: rewrite: only catch EnvironmentError 
This was changed unintentionally in 45c4a8fb3 (pytest 5.3.0), but only
EnvironmentErrors might have `errno`.
Since that is not really guaranteed and it is good to have more
information this uses the string representation of the exc in the trace
message.
 2020-02-25 17:29:30 +01:00
Daniel Hahler ac3a42bafd
doctest: strip newlines with unexpected exceptions (#6801) 2020-02-24 15:18:08 +01:00
Daniel Hahler be23aeb989
Remove unused `pytester.getdecoded` (#6805) 
Last usage was removed in 22dc47d9f.
 2020-02-24 14:33:26 +01:00
Daniel Hahler 9928c7794b
minor: fix trace msg: s/loaded/loading (#6798) 2020-02-23 17:12:30 +01:00
Daniel Hahler 706ea86bba
capture: factor out _get_multicapture (#6788) 
Ref: https://github.com/pytest-dev/pytest/pull/6671#issuecomment-588408992
 2020-02-22 23:39:20 +01:00
Daniel Hahler 1d5a0ef284
Fix pytest_ignore_collect hooks: do not return False (#6778) 
It should only return `True` when something is to be ignored, not
`False` otherwise typically.

This caused e.g. bad interaction with the cacheprovider (before
https://github.com/pytest-dev/pytest/pull/6448).
 2020-02-22 23:35:47 +01:00
Daniel Hahler c8b4a1a471
Handle `match` with `pytest.raises()` (#6753) 
Fixes https://github.com/pytest-dev/pytest/issues/6752.
 2020-02-22 23:32:55 +01:00
Daniel Hahler 68fe0eb8f3
Minor cosmetic fixes (#6792) 2020-02-22 19:24:41 +01:00
Daniel Hahler de854c6ee1
doc: `pytest.raises`: remove mention of removed `message` (#6793) 
Follow-up to 13f7f27fd.
 2020-02-22 19:24:00 +01:00
Daniel Hahler 04126feea7
doc: `pytest.raises`: link to `python:try` (#6794) 2020-02-22 19:23:35 +01:00
Daniel Hahler 478a244f5e
main: `args` must be a list, not tuple (#6791) 
Passing in a tuple crashes in `_prepareconfig`:

        def test_invoke_with_tuple(self):
    >       pytest.main(("-h",))

    src/_pytest/config/__init__.py:82: in main
        config = _prepareconfig(args, plugins)
    src/_pytest/config/__init__.py:229: in _prepareconfig
        return pluginmanager.hook.pytest_cmdline_parse(
    …
    src/_pytest/helpconfig.py:98: in pytest_cmdline_parse
        config = outcome.get_result()  # type: Config
    src/_pytest/config/__init__.py:808: in pytest_cmdline_parse
        self.parse(args)
    src/_pytest/config/__init__.py:1017: in parse
        self._preparse(args, addopts=addopts)
    _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

        def _preparse(self, args: List[str], addopts: bool = True) -> None:
            …
            if addopts:
                ini_addopts = self.getini("addopts")
                if ini_addopts:
    >               args[:] = self._validate_args(ini_addopts, "via addopts config") + args
    E               TypeError: can only concatenate list (not "tuple") to list

    addopts    = True
    args       = ('-h',)
    env_addopts = ''
    ini_addopts = ['-rfEX', …]

    src/_pytest/config/__init__.py:956: TypeError: can only concatenate list (not "tuple") to list

Might be worth handling (converting it to a list for example), but it
was documented to be a list to begin with when removing support for
strings (a7e401656).
 2020-02-22 13:16:46 +01:00
Daniel Hahler 47ccd58fb4 Fix typo in doc with syspath_prepend 2020-02-22 13:15:17 +01:00
Daniel Hahler 260f848c05 minor: remove outdated, superfluous comment 2020-02-22 13:15:17 +01:00
Daniel Hahler 2be06ba67e
Improve doc/typing/message for `ExceptionInfo.match` (#6776) 2020-02-21 16:41:57 +01:00
Daniel Hahler 4c9b850e13
help: --deselect: mention that this uses node id prefixes (#6770) 
Ref: https://github.com/pytest-dev/pytest/issues/6751
 2020-02-21 12:53:27 +01:00
Bruno Oliveira 435ad221f9 Deprecate TerminalReporter.writer 
Fix #6779
 2020-02-20 21:04:49 -03:00
Bruno Oliveira c91abe48ba Assorted improvements following up #6658 2020-02-20 18:51:41 -03:00
Daniel Hahler 4d633a29be
cacheprovider: fix typing with Path(py.path.local) (#6774) 
Fixes:

> Argument 1 to "Path" has incompatible type "Union[local, Any]";
> expected "Union[str, _PathLike[str]]"  [arg-type]

Ref: https://github.com/pytest-dev/py/pull/232#pullrequestreview-349549522
 2020-02-20 13:23:41 +01:00
Daniel Hahler 8a1633c3b4
tmpdir: clean up indirection via config for factories (#6767) 
Remove `_tmp_path_factory` and `_tmpdirhandler` from the config object.

- `_tmpdirhandler` has been deprecated since 2.8.0 (0f52856f9), when
  `tmpdir_factory` has been added.
- `_tmp_path_factory` should have probably never been added there in the
  first place, but maybe just used the same pattern (16e2737da).
 2020-02-20 12:48:33 +01:00
Daniel Hahler 82f5986424
capture: re-order classes (#6768) 
This better reflects the inheritance / smartness with regard to raw or
encoded.

- FDCaptureBinary
- FDCapture
- SysCaptureBinary
- SysCapture
- TeeSysCapture
 2020-02-20 11:00:19 +01:00
Daniel Hahler fb16d3e27a
capture: revisit/fix __repr__, define _in_suspended (#6749) 2020-02-20 00:51:57 +01:00
Daniel Hahler 2b13a9b95d
Use TYPE_CHECKING (#6771) 2020-02-19 22:07:54 +01:00
Daniel Hahler 1b30514783
LFPlugin: use sub-plugins to deselect during collection (#6448) 
Fixes https://github.com/pytest-dev/pytest/issues/5301.

Refactor/steps:

- use var
- harden test_lastfailed_usecase
- harden test_failedfirst_order
- revisit last_failed_paths
- harden test_lastfailed_with_known_failures_not_being_selected
 2020-02-19 21:33:03 +01:00
Ran Benita af2b0e1174
Merge pull request #6758 from bluetech/outcome-exception-callable-2 
Use a hack to make typing of pytest.fail.Exception & co work
 2020-02-19 22:08:21 +02:00
Daniel Hahler 781a730bea
terminal: remove confusing comment about `_tw` (#6763) 
Ref: https://github.com/blueyed/pytest/commit/cf0cac3b7#r37373455
 2020-02-19 20:35:50 +01:00
Daniel Hahler 4021770688
pytester: LineMatcher: use `_fail` with `_match_lines_random` (#6747) 2020-02-19 13:16:57 +01:00
Daniel Hahler f95c7f5803
doctest: handle any OutcomeException (#6669) 
Fixes using `pytest.xfail()` and `pytest.importorskip()` in doctests.

Ref: https://github.com/pytest-dev/pytest/issues/310
 2020-02-19 13:16:37 +01:00
Ran Benita 24dcc76495 Use a hack to make typing of pytest.fail.Exception & co work 
Mypy currently is unable to handle assigning attributes on function:
https://github.com/python/mypy/issues/2087.
pytest uses this for the outcome exceptions -- `pytest.fail.Exception`,
`pytest.exit.Exception` etc, and this is the canonical name by which they
are referred.

Initially we started working around this with type: ignores, and later
by switching e.g. `pytest.fail.Exception` with the direct exception
`Failed`. But this causes a lot of churn and is not as nice. And I also
found that some code relies on it, in skipping.py:

    def pytest_configure(config):
        if config.option.runxfail:
            # yay a hack
            import pytest

            old = pytest.xfail
            config._cleanup.append(lambda: setattr(pytest, "xfail", old))

            def nop(*args, **kwargs):
                pass

            nop.Exception = xfail.Exception
            setattr(pytest, "xfail", nop)
        ...

So it seems better to support it. Use a hack to make it work. The rest
of the commit rolls back all of the workarounds we added up to now.

`pytest.raises.Exception` also exists, but it's not used much so I kept
it as-is for now.

Hopefully in the future mypy supports this and this ugliness can be
removed.
 2020-02-18 23:17:27 +02:00
Daniel Hahler bc976dca3b
pytester: add __tracebackhide__ for matching randomly (#6746) 2020-02-16 10:29:59 +01:00
Ran Benita 7b8968ff80
Merge pull request #6735 from bluetech/metafunc-annotate 
Type annotate Metafunc
 2020-02-15 23:32:14 +02:00
Ran Benita 0c68e7a2c9
Merge pull request #6744 from bluetech/item-runtest-stub 
Add Item.runtest stub implementation
 2020-02-15 23:27:57 +02:00
Daniel Hahler 369284752e
terminal: refactor, no yellow ("boring") for non-last item (#6409) 2020-02-15 19:00:24 +01:00
Daniel Hahler e872532d0c Merge branch 'master' into term-color 
Conflicts:
	src/_pytest/terminal.py
	testing/test_debugging.py
	testing/test_terminal.py
 2020-02-15 18:46:29 +01:00
Ran Benita 5945c3fe88 Type annotate Metafunc 2020-02-15 17:13:18 +02:00
Ran Benita a7a1686433 Add Item.runtest stub implementation 
Every Item must implement this method (called on all items collected in
a session). Add a stub for typing and clarity.
 2020-02-15 16:58:55 +02:00
Ran Benita 371939fb86 Avoid getattr when dispatching pytest_runtest_* hooks 
Using getattr doesn't work with typing, and also breaks grep. It took me
a while to find where these hooks are called.
 2020-02-15 15:34:21 +02:00
Daniel Hahler 02aa8adae1 cacheprovider: use warnings directly 
Allows for filtering of PytestCacheWarning.

Using `_issue_warning_captured` is not necessary here, and was probably
only used because the cacheprovider misses warnings during
`pytest_sessionfinish`, which is also fixed here.

I think the usage of `_issue_warning_captured` can be removed/reduced
further, but also that this is good enough for now.

Ref: https://github.com/pytest-dev/pytest/issues/6681.
 2020-02-15 01:36:57 +01:00
Daniel Hahler 9631b3c166
reports: use attr.asdict with serialize_repr_{crash,traceback} (#6732) 
* Turn ReprTraceback into attrs class

* Use attr.asdict with serialize_repr_{crash,traceback}

* Turn ReprFileLocation into attrs class, convert py.path.local
 2020-02-14 19:39:34 +01:00
Bruno Oliveira ef73a56032
Merge pull request #6737 from bluetech/fixture-cached-result 
Don't delete FixtureDef.cached_result, set it to None instead
 2020-02-14 12:33:03 -03:00
Ran Benita d839686c7b Don't delete FixtureDef.cached_result, set it to None instead 
Previously `cached_result` was either set or deleted. Type annotations
cannot handle this, so use `None` for the non-set state instead.
 2020-02-14 14:18:58 +02:00
Daniel Hahler d89b5057ca
assertrepr_compare: provide more info (location) with exceptions (#6728) 2020-02-14 02:17:05 +01:00
Daniel Hahler dbae5a7ff8
Recognize `-V` as a short option for `--version` (#6721) 2020-02-13 12:30:22 +01:00
Daniel Hahler 07b7b6fa7d
doc: add docstring for CaptureManager._capturing_for_request (#6698) 
Based on the removed doc for `_install_capture_fixture_on_item`.

Follow-up to https://github.com/pytest-dev/pytest/pull/6663.

Co-authored-by: Ran Benita <ran234@gmail.com>
 2020-02-13 12:09:32 +01:00
Ran Benita 8a4d5227e2 Remove unused CallSpec2 fields _globalid, _globalparam 2020-02-13 12:31:48 +02:00
Bruno Oliveira e6ea9edffe
Merge pull request #6673 from sscherfke/features 
Reverse / fix meaning of "+/-" in error diffs
 2020-02-12 15:05:38 -03:00
Daniel Hahler b7ad4c2bed
_pformat_dispatch: pass through args (#6715) 2020-02-12 16:07:57 +01:00
Ran Benita c9f9664336 Merge branch 'features' into master 
The features branch is no more. Development of features is now also done
on master.

See https://github.com/pytest-dev/pytest/pull/6571.
 2020-02-12 13:50:02 +02:00
Bruno Oliveira 4209ad6fca
Use code highlighting if pygments is installed (#6658) 
* Use code highlighting if pygments is installed

* Use colorama constants instead of bare ascii codes

Could not find the exact equivalent of 'hl-reset' code using colorama
constants though.

* Refactor ASCII color handling into a fixture

* Revert back to using explicit color codes

* In Python 3.5 skip rest of tests that require ordered markup in colored output
 2020-02-12 08:32:37 -03:00
Bruno Oliveira 3ea74310d7
Fix crash when faulthandler starts initialized (#6598) 
Use suggestion in review and use a subplugin so hooks will only be active
if we enable faulthandler ourselves.

Fix #6575

Co-authored-by: Daniel Hahler <git@thequod.de>
 2020-02-12 11:06:20 +01:00
Daniel Hahler fa877665ad _set_main_color: does not need to return 2020-02-12 03:11:54 +01:00
Bruno Oliveira 78baa7b575 Merge remote-tracking branch 'upstream/master' into mm 
Conflicts:
	src/_pytest/main.py
	src/_pytest/mark/structures.py
	src/_pytest/python.py
	testing/test_main.py
	testing/test_parseopt.py
 2020-02-11 19:22:28 -03:00
Ran Benita 7484e346f9
Merge pull request #6711 from bluetech/mv-exitcode 
Move ExitCode's definition from _pytest.main to _pytest.config
 2020-02-11 09:49:38 +02:00
Ran Benita d33da078a8 Move ExitCode's definition from _pytest.main to _pytest.config 
ExitCode is used in several internal modules and hooks and so with type
annotations added, needs to be imported a lot.

_pytest.main, being the entry point, generally sits at the top of the
import tree.

So, it's not great to have ExitCode defined in _pytest.main, because it
will cause a lot of import cycles once type annotations are added (in
fact there is already one, which this change removes).

Move it to _pytest.config instead.

_pytest.main still imports ExitCode, so importing from there still
works, although external users should really be importing from `pytest`.
 2020-02-10 23:55:06 +02:00
Stefan Scherfke d59adc61f9 Reverse / fix meaning of "+/-" in error diffs 
The convention is "assert result is expected".  Pytest's error diffs now
reflect this. "-" means that sth. expected is missing in the result and
"+" means that there are unexpected extras in the result.

Fixes: #3333
 2020-02-10 21:12:37 +01:00
Ran Benita 7cc513b2af Remove unused NodeMarkers 
This class was both added and became unused during the development of a
PR:
https://github.com/pytest-dev/pytest/pull/3317
 2020-02-10 22:05:25 +02:00
Ran Benita 1ebca37689
Merge pull request #6708 from bluetech/redundant-commas-2 
Remove some redundant commas
 2020-02-10 21:26:55 +02:00
Ran Benita 3e4e6297ce Remove unused field FixtureManager._arg2finish 
Not used since 4f0879ff9b.
 2020-02-10 17:30:20 +02:00
Ran Benita 0b2b40e35d Remove some redundant commas 
Fix mypy errors:

src/_pytest/runner.py:36: error: "addoption" of "OptionGroup" does not return a value  [func-returns-value]
src/_pytest/helpconfig.py:64: error: "addoption" of "OptionGroup" does not return a value  [func-returns-value]
src/_pytest/terminal.py:67: error: "_addoption" of "OptionGroup" does not return a value  [func-returns-value]
src/_pytest/terminal.py:75: error: "_addoption" of "OptionGroup" does not return a value  [func-returns-value]
 2020-02-10 17:28:05 +02:00
Daniel Hahler f9dd58000a
Fix CaptureManager.__repr__ (#6697) 2020-02-10 13:03:05 +01:00
Daniel Hahler 30cb598e9c
Typing around/from types in docs (#6699) 2020-02-09 11:42:07 +01:00
Daniel Hahler 114de91ab7 factor out _determine_main_color 
(cherry picked from commit f36b9f7fa4fa1af7130406166df5c2be668e50c9)
 2020-02-09 00:26:38 +01:00
Daniel Hahler 7a7c634e33 factor out KNOWN_TYPES 
(cherry picked from commit 1180aedee727f7e8468fdc5561a87e12865622c6)
 2020-02-09 00:26:26 +01:00
Daniel Hahler b4ace46c42
capture: cleanup item fixture handling (#6663) 
This started by looking at how to get the current test item in general,
and then I noticed that it is not necessary for the capture plugin to
track it manually in the first place.
 2020-02-07 19:23:37 +01:00
Daniel Hahler a8fc056aad
Handle `Exit` exception in `pytest_sessionfinish` (#6660) 2020-02-07 00:40:10 +01:00
Vladyslav Rachek 9e262038c8
[parametrize] enforce explicit argnames declaration (#6330) 
Every argname used in `parametrize` either must
be declared explicitly in the python test function, or via
`indirect` list

Fix #5712
 2020-02-06 20:20:25 -03:00
Minuddin Ahmed Rana ef437ea448
Remove incorrect choices comment (#6677) 2020-02-05 20:45:21 +01:00
Daniel Hahler cdc7e13067
pytester: clarify _makefile signature (#6675) 2020-02-05 20:42:57 +01:00
Daniel Hahler 39d9f7cff5
pytester: LineMatcher: typing, docs, consecutive line matching (#6653) 2020-02-04 22:47:18 +01:00
Daniel Hahler 632800add5
internal: clean up getfslineno (#6656) 2020-02-04 22:46:00 +01:00
Daniel Hahler 5a4c1b628b
Use inspect.getdoc to massage fixture docstrings (#6668) 
Ref: https://github.com/pytest-dev/pytest/pull/2575
 2020-02-04 03:07:53 +01:00
Daniel Hahler aa0328782f
assertion: save/restore hooks on item (#6646) 2020-02-04 02:56:23 +01:00
Daniel Hahler 9c7f1d9b32 Remove compat.getfslineno 2020-02-04 02:40:59 +01:00
Daniel Hahler dab90ef726 typing: fix getfslineno 
Closes https://github.com/pytest-dev/pytest/pull/6590.
 2020-02-03 19:09:08 +01:00
Daniel Hahler 61f2a26675 Code/getfslineno: keep empty co_filename 
Previously this would be turned via `py.path.local("")` into the current
working directory.

This appears to be what `fspath = fn and py.path.local(fn) or None`
tries to avoid in `getfslineno`'s `TypeError` handling already, if
`Code` would raise it.
 2020-02-03 19:09:08 +01:00
Daniel Hahler b0d45267c5 internal: clean up getfslineno 
Everything was using `_pytest.compat.getfslineno` basically, which
wrapped `_pytest._code.source.getfslineno`.

This moves the extra code from there into it directly, and uses the
latter everywhere.

This helps to eventually remove the one in compat eventually, and also
causes less cyclic imports.
 2020-02-03 19:09:08 +01:00
Daniel Hahler 75714ee707
pluginmanager.consider_preparse: add exclude_only kwarg (#6443) 
Plugins specified with ``-p`` are now loaded after internal plugins, which
results in their hooks being called *before* the internal ones.

This makes the ``-p`` behavior consistent with ``PYTEST_PLUGINS``.

* fix/adjust test_disable_plugin_autoload
* adjust test_plugin_loading_order
 2020-02-03 14:10:54 +01:00
Daniel Hahler 8ec4d03c91
Inline FunctionMixin with Function (#6664) 
`Generator` was removed in 7eb28f9eb, and this pleases mypy to correctly
complain that `FunctionMixin` has no `config` (within
`_prunetraceback`).

* typing: _prunetraceback

* minor: imports, typing
 2020-02-03 10:25:32 +01:00
Daniel Hahler 99d162e44a Handle `Exit` exception in `pytest_sessionfinish` 
Similar to a7268aa (https://github.com/pytest-dev/pytest/pull/6258).
 2020-02-02 23:13:23 +01:00
Ran Benita 8bd612b367 typing: wrap_session 
Pulled out of https://github.com/pytest-dev/pytest/pull/6556.
 2020-02-02 23:12:48 +01:00
Daniel Hahler 5256542ea4 pytester.LineMatcher: add support for matching lines consecutively 2020-02-01 23:48:58 +01:00
Daniel Hahler 50f81db817 revisit/improve docstrings 2020-02-01 23:48:58 +01:00
Daniel Hahler 2681b0aed7 typing: pytester: LineMatcher 2020-02-01 23:48:57 +01:00
Daniel Hahler b10ab0211c Use TypeError instead of AssertionError for no sequence 
Improve/extends tests.
 2020-02-01 23:48:57 +01:00
Daniel Hahler a9c5d31806
PyCollector._genfunctions: use already created fixtureinfo (#6636) 
`Function` creates a `_fixtureinfo` already:
https://github.com/pytest-dev/pytest/blob/fed535694/src/_pytest/python.py#L1392-L1395
 2020-02-01 06:27:41 +01:00
Bruno Oliveira 39b25ddcf3
Remove deprecated 'pytest_itemstart' hook (#6637) 
Remove deprecated 'pytest_itemstart' hook
 2020-01-31 16:12:27 -03:00
Ran Benita a435faad5c Merge branch 'master' into master-to-features 2020-01-31 11:27:06 +02:00
Bruno Oliveira 70739296e1 Remove deprecated 'pytest_itemstart' hook 
This hook has been deprecated/removed for more than 10 years
in a2fe6714f8.
 2020-01-30 21:03:29 -03:00
Daniel Hahler 1dc265e34a
Merge pull request #6633 from blueyed/async_warn 
python: factor out async_warn
 2020-01-30 23:39:06 +01:00
Daniel Hahler e7a833635d
Merge pull request #6635 from blueyed/fix-todo 
minor: doc: getfuncargnames: move TODO out of docstring
 2020-01-30 23:37:41 +01:00
Daniel Hahler fed5356941
Merge pull request #6634 from blueyed/fixtures-move-import 
fixtures: move import of ParameterSet to top level
 2020-01-30 23:22:39 +01:00
Daniel Hahler 5b81bd862c minor: doc: getfuncargnames: move TODO out of docstring 2020-01-30 23:22:10 +01:00
Daniel Hahler 2902c7263c fixtures: move import of ParameterSet to top level 
This gets typically used always (via `getfixtureinfo`).
 2020-01-30 23:03:02 +01:00
Daniel Hahler 442dccef65 python: factor out async_warn 2020-01-30 22:55:23 +01:00
Daniel Hahler 88b800355a typing: pytest_collection 2020-01-30 19:58:43 +01:00
Daniel Hahler 28b8f3ca3a
Merge pull request #6461 from blueyed/test-package-upstream 
Package: typing, cleanup
 2020-01-30 16:41:47 +01:00
Bruno Oliveira 64ab68ff0a
Fix 6341 disallow session config in fromparent (#6387) 
Fix 6341 disallow session config in fromparent
 2020-01-29 19:21:02 -03:00
Anthony Sottile 595d62bc3e
Merge pull request #6607 from asottile/empty_string_parametrize_nodeid 
Fix node ids which contain a parametrized empty-string variable
 2020-01-29 08:42:04 -08:00
Daniel Hahler 55e5817570 Merge master into features 2020-01-29 03:07:35 +01:00
Daniel Hahler 3ccf2a5e61
Merge pull request #6524 from blueyed/reportchars-default 
terminal: default to `fE` with `-r` (reportchars)
 2020-01-29 01:00:41 +01:00
Bruno Oliveira d282424589
Fix unguarded `==` comparison in fixtures. (#6541) 
Fix unguarded `==` comparison in fixtures.
 2020-01-28 20:54:14 -03:00
Daniel Hahler ddaa5d88ac terminal: default to `fE` with `-r` (reportchars) 
Adds handling of `N` to reset `reportchars`, which can be used to get
the old behavior (`-rN`), and also allows for an alternative to
`--disable-warnings` (https://github.com/pytest-dev/pytest/issues/5066),
since `w` was included by default (without `--disable-warnings`).

Fixes https://github.com/pytest-dev/pytest/issues/6454
 2020-01-29 00:33:15 +01:00
Daniel Hahler 4ff90b1fcf
Merge pull request #6606 from blueyed/typing-monkeypatch-context 
typing: MonkeyPatch.context
 2020-01-29 00:12:53 +01:00
Anthony Sottile abd5fc80e8 Fix node ids which contain a parametrized empty-string variable 2020-01-28 13:27:54 -08:00
Holger Kohr 80d4dd6f0b Replace `==` with `is` for comparison of cache keys 
Closes #6497
 2020-01-28 18:05:53 -03:00
Ran Benita e440b43258
Merge pull request #6555 from bluetech/nodes-cache-split 
Split Session._collection_node_cache to 3 mutually exclusive parts
 2020-01-28 22:49:42 +02:00
Daniel Hahler e25d46aae6 typing: MonkeyPatch.context 2020-01-28 21:44:30 +01:00
Daniel Hahler 7c87874277 source_path: py.path.local directly 
Via bc7282576.
 2020-01-28 19:02:41 +01:00
Daniel Hahler 1cf9e68dbc tests: cover absolute path handling in _compute_fixture_value 2020-01-28 18:53:28 +01:00
Daniel Hahler 18ac7e0b79
Merge pull request #6593 from blueyed/typing-ignore-more-itertools 
typing: ignore false positive with more-itertools
 2020-01-28 14:24:24 +01:00
Daniel Hahler 12c5a6af64 typing: fix Code.path 
Fixes:

> src/_pytest/_code/code.py:83: error: Incompatible types in assignment
>   (expression has type "str", variable has type "local")  [assignment]
 2020-01-28 01:49:45 +01:00
Daniel Hahler 30922ee694 Merge master into features 2020-01-28 01:40:14 +01:00
Daniel Hahler 35ba053f00 typing: ignore false positive with more-itertools 
Fixed in https://github.com/erikrose/more-itertools/pull/374.
 2020-01-28 01:23:44 +01:00
Daniel Hahler 9c716e4d74 typing: Testdir.plugins 2020-01-28 00:41:46 +01:00
Daniel Hahler 94ac0f7e6b typing: self._mod_collections, collect_by_name 2020-01-28 00:41:46 +01:00
Daniel Hahler 440881d63a typing: Testdir.__init__ 2020-01-28 00:41:46 +01:00
Ran Benita ae5d16be10 typing: FSHookProxy/gethookproxy 
Taken out of https://github.com/pytest-dev/pytest/pull/6556.
 2020-01-27 20:57:44 +01:00
Daniel Hahler bf5c76359c fixup! typing: tests: tmpfile 2020-01-26 23:14:32 +01:00
Daniel Hahler 3f8f395210 typing: EncodedFile 2020-01-25 19:20:48 +01:00
Daniel Hahler e2934c3f8c Move common code between Session and Package to FSCollector 2020-01-25 19:04:01 +01:00
Daniel Hahler 6b7e1a246c Sync `{Session,Package}.gethookproxy` 
Only copy'n'paste error from c416b1d935.
 2020-01-25 19:04:01 +01:00
Daniel Hahler 817c094ce6 Clean up Package.__init__ 
Makes `parent` a required arg, which would have failed before via
`parent.session` anyway.

Keeps calling/passing unused args for B/C.
 2020-01-25 19:04:01 +01:00
Daniel Hahler 039d582b52 Fix `EncodedFile.writelines` 
This is implemented by the underlying stream already, which additionally
checks if the stream is not closed, and calls `write` per line.

Ref/via: https://github.com/pytest-dev/pytest/pull/6558#issuecomment-578210807
 2020-01-25 18:06:50 +01:00
Daniel Hahler 9b8039cf09 Sync `{Session,Package}._recurse` 2020-01-25 16:44:20 +01:00
Daniel Hahler 57512aa997 _get_main_color: no yellow ("boring") for non-last item 
- refactor _get_main_color/build_summary_stats_line
- factor out property _is_last_item; test_summary_stats: tr._is_last_item
- _write_progress_information_filling_space: remove color arg
- use setter for stats, handling main color
- _get_main_color: skip cache for last item
- Handle random order in test for py35.
 2020-01-25 15:09:02 +01:00
Daniel Hahler c51173d426 Merge master into features 2020-01-25 14:18:02 +01:00
Ran Benita 94d8c071b6 Remove a couple of redundant commas 
Mypy complains about this once the function is typed:

src/_pytest/main.py:85: error: "_addoption" of "OptionGroup" does not return a value
src/_pytest/main.py:133: error: "addoption" of "OptionGroup" does not return a value
 2020-01-25 14:12:47 +01:00
Ran Benita f3967333a1 Split Session._collection_node_cache to 3 mutually exclusive parts 
Previously, this cache was used with 3 different and mutually exclusive
key-type -> value-type combinations. Mypy can't properly type this. It's
also quite confusing.

Split to 3 different dicts instead.
 2020-01-25 14:31:12 +02:00
Ran Benita a76bc64c54
Merge pull request #6547 from bluetech/session-initialparts 
Refactor Session._initialparts to have a more explicit type
 2020-01-25 14:30:26 +02:00
Ran Benita dd5c2b22bd Refactor Session._initialparts to have a more explicit type 
Previously, _initialparts was a list whose first item was a
`py.path.local` and the rest were `str`s. This is not something that
mypy is capable of modeling. The type `List[Union[str, py.path.local]]`
is too broad and would require asserts for every access.

Instead, make each item a `Tuple[py.path.local, List[str]]`. This way
the structure is clear and the types are accurate.

To make sure any users who might have been accessing this (private)
field will not break silently, change the name to _initial_parts.
 2020-01-25 13:57:49 +02:00
Tomáš Gavenčiak 5e15c86cc6 Fix EncodedFile.write return value 
Make EncodedFile, used for captured output streams, method .write return
the number of characters written. Add test for captured stderr write.
Fixes #6557.

Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2020-01-25 10:36:23 +01:00
Daniel Hahler 09bdbffbde Merge master into features 
Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py
 2020-01-24 23:44:50 +01:00
Daniel Hahler 03bc8aba4e config: typing for create_terminal_writer, re-export TerminalWriter 
This also imports `TerminalWriter` explicitly via `_pytest._io`,
allowing for easier extending / replacing it.
 2020-01-23 14:09:37 +01:00
Daniel Hahler 6b13379f37
Merge pull request #6521 from blueyed/harden-nose-raises 
tests: improve test for `nose.raises`
 2020-01-23 13:42:14 +01:00
Ran Benita 9dcdea5de7 Rewrite Item.location to be clearer with regard to types 2020-01-23 13:25:15 +01:00
Daniel Hahler 8521503246
Merge pull request #6527 from blueyed/typing-getfslineno 
typing: fix/adjust _code.source.getfslineno
 2020-01-23 13:17:47 +01:00
Ran Benita 0b6258ab5b PyCollector.collect: use explicit cast to `str` 
Ref: https://github.com/pytest-dev/pytest/pull/6521#pullrequestreview-347234792
 2020-01-23 12:54:52 +01:00
Daniel Hahler 9c7b3c57d7 typing: PyobjMixin.reportinfo, getfslineno 2020-01-23 10:45:31 +01:00
Daniel Hahler 1350c601dc Node.location: handle str with _node_location_to_relpath 2020-01-23 10:45:31 +01:00
Daniel Hahler ef112fd7dd Revert "Revert "Fix type errors after adding types to the `py` dependency"" 
Without changes to test_itemreport_reportinfo.

This reverts commit fb99b5c66e.

Conflicts:
	testing/test_nose.py
 2020-01-23 10:45:27 +01:00
Daniel Hahler ad02f6f879
Merge pull request #6525 from blueyed/typing-session 
typing: Session.__init__
 2020-01-23 00:16:08 +01:00
Daniel Hahler bd6ba3f3e1 typing: Session.__init__ 
Pulled out of https://github.com/pytest-dev/pytest/pull/6491.
 2020-01-23 00:07:59 +01:00
Bruno Oliveira e17f5fad14
Clear node collection cache after collection is done (#6491) 
Clear node collection cache after collection is done
 2020-01-22 16:08:59 -03:00
Daniel Hahler aca1723d45 Merge master into features 2020-01-22 19:18:13 +01:00
Bruno Oliveira 93b74d28d2 Merge remote-tracking branch 'upstream/master' into mm 
Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py
 2020-01-22 11:03:45 -03:00
Daniel Hahler b8787b8732 tests: fix test_cwd_snapshot 
Without restoring the cwd, successive tests might fail to parse the
config (via `_pytest.config._prepareconfig()`, for when `--lsof` is
used).

And it is good practice to restore the cwd in any case anyway.
 2020-01-22 14:34:11 +01:00
Daniel Hahler 62db3f7abc typing: fix/adjust _code.source.getfslineno 2020-01-21 19:48:17 +01:00
Daniel Hahler 7ee27fedee doc: fix Code.path: might return str 2020-01-21 19:46:43 +01:00
Bruno Oliveira 7b1e3d1c9a Clear collection caches after collection is done 
Also rename the involved variables to convey its intent better and
add type hints
 2020-01-21 07:29:13 -03:00
Ran Benita fb99b5c66e Revert "Fix type errors after adding types to the `py` dependency" 
This reverts commit 930a158a6a.

Regression test from Bruno Oliveira.
 2020-01-20 23:44:56 +02:00
Bruno Oliveira cdaa9c06e1
Revert "fixtures register finalizers with all fixtures before t… (#6496) 
Revert "fixtures register finalizers with all fixtures before them in the stack"
 2020-01-20 13:49:00 -03:00
Ran Benita 3392be37e1 Fix check_untyped_defs in test_runner 2020-01-19 20:01:07 +02:00
Ran Benita 3d2680b31b Fix type of pytest.warns, and fix check_untyped_defs in test_recwarn 
The expected_warning is optional.
 2020-01-19 19:39:14 +02:00
Ran Benita 0c247be769 Add a few missing type annotations in _pytest._code 
These are more "dirty" than the previous batch (that's why they were
left out). The trouble is that `compile` can return either a code object
or an AST depending on a flag, so we need to add an overload to make the
common case Union free. But it's still worthwhile.
 2020-01-19 19:39:14 +02:00
Ran Benita 3e6f0f34ff Cleanup unhelpful alias _AST_FLAG 
Also replace one direct call to `compile` with this flag with the
equivalent wrapper `ast.parse`. This function can have a more precise
type.
 2020-01-19 19:19:34 +02:00
Ran Benita 930a158a6a Fix type errors after adding types to the `py` dependency 2020-01-19 14:48:24 +02:00
Daniel Hahler d347a30656
Merge pull request #6510 from blueyed/typing-fixes 
typing: fix some "incompatible types in assignment" with py
 2020-01-19 13:01:35 +01:00
Daniel Hahler 32b62f770f
Merge pull request #6509 from blueyed/typing-minor 
typing: minor improvements
 2020-01-19 11:33:41 +01:00
Daniel Hahler aaae43e0ba typing: fix some "incompatible types in assignment" with py 2020-01-19 11:32:45 +01:00
Daniel Hahler 09e9a01df3 typing: fix _TracebackStyle: add "line" 2020-01-19 11:22:47 +01:00
Daniel Hahler 5c445b05e7 typing: py.io.TerminalWriter for tw arguments 2020-01-19 11:21:16 +01:00
Daniel Hahler 4e0dbe92dd Node.name: str 2020-01-19 11:21:16 +01:00
Daniel Hahler 956389fa8c Session._fixturemanager 2020-01-19 11:21:16 +01:00
Bruno Oliveira cc7f294cfe Revert "fixtures register finalizers with all fixtures before them in the stack" 
This reverts commit 99180939fe.
 2020-01-17 12:55:57 -03:00
Daniel Hahler 4a42deee7e typing: Node.reportinfo: might return py.path.local via fspath 2020-01-17 11:05:46 +01:00
Daniel Hahler 36944157f8 pytester: typing for `spawn`/`spawn_pytest` 2020-01-17 05:58:25 +01:00
Daniel Hahler 1667cf3350
Merge pull request #6384 from pv/showlocals-short 
Make --showlocals work together with --tb=short

Fixes https://github.com/pytest-dev/pytest/issues/494
Ref: https://github.com/pytest-dev/pytest/issues/1715
 2020-01-16 22:04:14 +01:00
Daniel Hahler 5f4cd536f9 Use _pytest.compat.TYPE_CHECKING 2020-01-16 19:47:23 +01:00
Daniel Hahler 83813bf515 Merge master into features 
Conflicts:
	.github/workflows/main.yml
 2020-01-16 19:45:52 +01:00
Daniel Hahler 4630e2725e Use `TYPE_CHECKING` instead of `False` 
This allows for e.g. Jedi to infer types (it checks the name).

It was only used to support Python 3.5.0/3.5.1, where this is is not
available in the `typing` module.

Ref: https://github.com/davidhalter/jedi/issues/1472

Uses `TYPE_CHECKING = False` in `_pytest.outcomes` to avoid having to
work around circular import.
 2020-01-16 16:11:39 +01:00
Jakub Mitoraj ab6406b42e Update junit_logging with no,log,system-out,system-err,out-err,all 2020-01-16 08:14:46 +01:00
Chris NeJame 99180939fe fixtures register finalizers with all fixtures before them in the stack 2020-01-15 11:00:42 -05:00
Ronny Pfannschmidt 8ba0b7bc2a fix #6341 - disallow session/config in Node.from_parent 2020-01-15 13:00:46 +01:00
Daniel Hahler f5844449a8
Merge pull request #6442 from blueyed/rP 
terminal: summary_passes: handle teardown sections
 2020-01-15 03:02:09 +01:00
Pauli Virtanen fd1691a2b3 Make --showlocals work together with --tb=short 
Enable showing local variables when asked to do so in the short
traceback mode.

Fixes #494
 2020-01-14 21:30:58 +02:00
Daniel Hahler 910d5df6a8
Merge pull request #6456 from blueyed/fix-doc-_splitnode 
minor: fix doc/example for _pytest.nodes._splitnode
 2020-01-14 15:22:01 +01:00
Bruno Oliveira e9d9f71374 Merge remote-tracking branch 'upstream/master' into mm 2020-01-14 09:17:52 -03:00
Daniel Hahler 189fe3ba1d minor: fix doc/example for _pytest.nodes._splitnode 2020-01-14 12:40:36 +01:00
Daniel Hahler f0c7f21312 Remove "pragma: no cover" comments 2020-01-14 09:15:36 +01:00
Daniel Hahler 8eec42f040
Merge pull request #6455 from blueyed/mypy-master 
master: update mypy 0.740 -> 0.761
 2020-01-14 08:56:51 +01:00
Ran Benita 090e260517 master: update mypy 0.740 -> 0.761 
(cherry picked from commit 16ff9f591e)
(cherry picked from commit 4848bbdf9a)
 2020-01-14 06:31:41 +01:00
Daniel Hahler 117072d64c typing: fix _pytest.config.findpaths.determine_setup 2020-01-13 11:45:20 +01:00
Daniel Hahler 61d04d3084 terminal: summary_passes: handle teardown sections 
Fixes https://github.com/pytest-dev/pytest/issues/2780.
 2020-01-11 21:58:19 +01:00
Daniel Hahler 1356d20e90 Merge master into features 2020-01-10 05:20:41 +01:00
Daniel Hahler 1e28cb855d
Merge pull request #6425 from blueyed/xfail-yellow 
terminal: use "yellow" with any "xpassed" tests
 2020-01-09 23:22:58 +01:00
Bruno Oliveira 29db2da9a7
tmpdir_factory.mktemp now fails given absolute and non-normaliz… (#6323) 
tmpdir_factory.mktemp now fails given absolute and non-normalized paths.
 2020-01-09 19:10:03 -03:00
Bruno Oliveira 5b295ec68e Merge remote-tracking branch 'upstream/features' into gftea/features 2020-01-09 18:41:47 -03:00
Bruno Oliveira fa645a7003 Improve docstrings for mktemp 2020-01-09 18:20:46 -03:00
Daniel Hahler 13baab746d terminal: use "yellow" with any "xpassed" tests 
Closes https://github.com/pytest-dev/pytest/issues/449.
 2020-01-09 22:20:41 +01:00
Daniel Hahler 2d2c67d7c0 cacheprovider: pytest_collection_modifyitems: copy items 2020-01-09 21:48:54 +01:00
Bruno Oliveira 0e00069340 Fix serialization of 'None' reprcrashes 
Tracebacks coming from remote processes crated by the multiprocess module
will contain "RemoteTracebacks" which don't have a 'reprcrash' attribute

Fix #5971
 2020-01-06 22:04:38 -03:00
Bruno Oliveira 91a96ec3d6 Remove usage of parser module, deprecated in Python 3.9 
Fix #6404
 2020-01-06 08:57:07 -03:00
Bruno Oliveira 12f74a28fa Revert "Remove unused _pytest.code.Source.isparseable function" 
This reverts commit c627ac4e59.
 2020-01-05 14:12:40 -03:00
Bruno Oliveira c627ac4e59 Remove unused _pytest.code.Source.isparseable function 
Besides unused, it uses the (deprecated in Python 3.9) parser module

Fix #6404
 2020-01-05 12:33:12 -03:00
Daniel Hahler 7aac48c418
Merge pull request #6382 from blueyed/fix-parseoutcomes 
Fix `RunResult.parseoutcomes` (follow-up to #6353)
 2020-01-04 00:49:24 +01:00
Ran Benita 0375c1b728
Merge pull request #6388 from bluetech/mypy-761 
Update mypy 0.750 -> 0.761
 2020-01-01 16:07:55 +02:00
Ran Benita 4848bbdf9a Update mypy 0.750 -> 0.761 
This fixes some type: ignores due to typeshed update.

Newer mypy seem to ignore unannotated functions better, so add a few
minor annotations so that existing correct type:ignores make sense.
 2020-01-01 15:22:16 +02:00
Daniel Hahler 1c0242dec1 Fix `RunResult.parseoutcomes` (follow-up to #6353) 2019-12-30 17:08:52 +01:00
Daniel Hahler a5224f7490 Revert black formatting of essential_plugins 
Done in a02310a140 (likely automatic), but loses information of the
comment obviously.
 2019-12-30 15:28:37 +01:00
Daniel Hahler a5863ca760 minor: split doc with _early_rewrite_bailout 2019-12-30 09:41:36 +01:00
Bruno Oliveira 8077168387
pytester: quick fix error introduced in #5990 (#6353) 
pytester: quick fix error introduced in #5990
 2019-12-27 13:28:11 -03:00
Alexandre Mulatinho dc7bf518b3 pytester: quick fix error introduced in #5990 
- added a test to check this condition

Signed-off-by: Alexandre Mulatinho <alex@mulatinho.net>
 2019-12-18 16:36:24 -03:00
Bruno Oliveira 75493f78bf
Merge master into features (#6346) 
Merge master into features
 2019-12-16 21:57:26 -03:00
Bruno Oliveira c487cf9dd5
Deprecate no print logs (#6333) 
Deprecate no print logs
 2019-12-16 19:01:16 -03:00
Seth Junot d4879c7afb Optimized renaming of test parameter ids 
While using pytest-repeat, I noticed the previous implementation is slow
for a large number of duplicate test ids. To optimize, this commit
reduces the amount of data copied and avoids using `in` with List
(unhashable type, and therefore is very slow for many elements).
 2019-12-16 18:53:48 -03:00
Vinay Calastry afbaee7649 Deprecate --no-print-logs option 2019-12-14 16:46:30 -08:00
Bruno Oliveira 853889e5db Merge remote-tracking branch 'upstream/master' into mm 2019-12-14 10:45:44 -03:00
Bruno Oliveira f7409f8685 Improve warning about incoming change to 'junitxml_family' default 
Fix #6265
 2019-12-13 09:17:12 -03:00
Bruno Oliveira 66c1a120ba
Bugfix 5430 pass logs to junit report (#6274) 
Bugfix 5430 pass logs to junit report
 2019-12-12 09:35:25 -03:00
gftea 226f0c48bf fix #5686, mktemp now fails given absolute and non-normalized paths. 2019-12-12 13:00:23 +01:00
Bruno Oliveira fa51a26743 Make -r letters "s" and "S" aliases 
Similar reasons as the previous commit
 2019-12-12 07:48:07 -03:00
Bruno Oliveira 59067ad33d Make -r letters "f" and "F" aliases 
As far as the output is concerned, they are both identical so it doesn't
make sense to have both.

setup, teardown, and collect failures are already reported as "errors", "E".
 2019-12-12 07:43:37 -03:00
Bruno Oliveira cbb2f9541b
Merge pull request #6316 from cb109/make-keyword-expression-matching-case-insensitive 
Make keyword expression matching case-insensitive
 2019-12-12 06:47:59 -03:00
cmachalo e13ad22364 Include new --capture-mode=tee-sys option 
Fix #4597
 2019-12-09 13:05:23 -03:00
Christoph Bülter 3a0f436c1a
Iterate a generator expression instead of a temporary list 
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2019-12-06 08:40:49 +01:00
Christoph Buelter ac5929eef3 Update docs about case-insensitive expression matching 2019-12-05 14:13:22 +01:00
Christoph Buelter e24b6b0388 Change -k EXPRESSION matching to be case-insensitive 2019-12-05 14:03:10 +01:00
Bruno Oliveira c7f9fda42d Fix assertion rewriting module detection for egg dists 
Fix #6301
 2019-12-04 15:30:45 -03:00
Bruno Oliveira 985ac09048
Merge master into features (#6312) 
Merge master into features
 2019-12-03 13:36:58 -03:00
Bruno Oliveira 59f95b7f59 Merge remote-tracking branch 'upstream/master' into mm 2019-12-03 11:07:34 -03:00
Bruno Oliveira 41b7b109e9
Merge branch 'features' into unittest-debug 2019-12-03 10:52:53 -03:00
Bruno Oliveira e5bd7fb053 Convert pytest.py into a package 
As discussed in https://github.com/pytest-dev/pytest/issues/3342, this
is the first step to make pytest support static typing fully
 2019-12-02 19:27:11 -03:00
Ran Benita 16ff9f591e Update mypy 0.740 -> 0.750 
Release notes:
https://mypy-lang.blogspot.com/2019/11/mypy-0.html
 2019-12-02 21:52:11 +02:00
Bruno Oliveira 172b82875a Ensure cache supporting files still exist after --cache-clear 
Fix #6290
 2019-12-01 10:36:47 -03:00
Anthony Sottile 209d99102d
Merge pull request #6234 from asottile/remove_none_warning 
Revert "A warning is now issued when assertions are made for `None`"
 2019-11-26 13:04:42 -08:00
Daniel Hahler a1219ab8fc pytester: use no colors with inline runs by default 
Sets `PY_COLORS=0` in the environment by default, which is used by pylib.

Via https://github.com/blueyed/pytest/pull/58

(initially cherry picked from commit f153ad33d10)
 2019-11-25 23:48:11 +01:00
Claudio Madotto 31d5cedc6d Avoid duplicating system-out and system-error tags 2019-11-25 12:59:03 +01:00
Claudio Madotto b66dc80008 Fix for issue #5430 - junit-xml: logs are not passed to junit report for tests failed not in a teardown phase 2019-11-25 12:59:03 +01:00
Daniel Hahler bc7282576f typing: minor improvements 2019-11-24 23:20:03 +01:00
Daniel Hahler d7d5cf4136
Merge pull request #6215 from blueyed/cleanup-exc 
_idval: remove trailing newline from exception
 2019-11-24 20:29:46 +01:00
Felix Yan b7bc52f770
Correct a typo in _pytest/config/__init__.py 2019-11-24 20:28:10 +08:00
Ronny Pfannschmidt c99c7d0f95 deprecate direct node construction and introduce Node.from_parent 2019-11-23 21:54:11 +01:00
Bruno Oliveira 886b8d27c6
Merge pull request #5984 from phloose/acceptance-tests_pytest-dev/pytest/#4445 
Add acceptance tests for "config warnings" stacklevel (#4445)
 2019-11-22 19:45:41 -03:00
Daniel Hahler b0ebcfb785 pytester: remove special handling of env during inner runs 
Closes https://github.com/pytest-dev/pytest/issues/6213.
 2019-11-22 21:50:31 +01:00
Nikolay Kondratyev 5e097970df Fix line detection for properties in doctest tests 
Co-Authored-By: Daniel Hahler <github@thequod.de>
 2019-11-22 23:50:20 +03:00
Philipp Loose a02310a140 Add stacklevel tests for warnings, 'location' to pytest_warning_captured 
Resolves #4445 and #5928 (thanks to allanlewis)

Add CHANGELOG for location parameter
 2019-11-22 17:50:00 -03:00
Daniel Hahler 0601f5cdad
Merge pull request #6261 from blueyed/stats-keys 
terminal: _get_main_color: help pytest-parallel
 2019-11-22 17:12:33 +01:00
Daniel Hahler 1f736a663d terminal: _get_main_color: help pytest-parallel 
Use `dict.keys()` to work around `__iter__` not working with a
multiprocessing DictProxy.

Ref: https://github.com/python/cpython/pull/17333
Fixes https://github.com/pytest-dev/pytest/issues/6254.
Ref: https://github.com/browsertron/pytest-parallel/issues/36
 2019-11-22 05:48:10 +01:00
Daniel Hahler 2344982d7f main: wrap_session: handle exit.Exception with notify_exception 
Fixes https://github.com/pytest-dev/pytest/issues/6257.
Via https://github.com/blueyed/pytest/pull/132.
 2019-11-21 22:50:33 +01:00
Daniel Hahler df0c652333 Merge master into features 2019-11-21 20:31:52 +01:00
Mark Dickinson 2ffbe41ae5 clear sys.last_traceback via del instead of = None 2019-11-21 13:06:47 +00:00
Ran Benita 5820c5c5a6
Merge pull request #6241 from bluetech/type-annotations-9 
Add type annotations to _pytest.config.argparsing and corresponding Config code
 2019-11-21 13:33:13 +02:00
Daniel Hahler b96e0a71a6 pytester: LineMatcher: __tracebackhide__ with _fail 
Follow-up to 2228ccb (gone lost in resolving the conflict).
 2019-11-21 01:23:36 +01:00
Daniel Hahler ed012c808a
Merge pull request #6174 from blueyed/ids-iter 
parametrized: ids: support generator/iterator
 2019-11-21 00:37:25 +01:00
Daniel Hahler 6b75a7733b
Merge pull request #6247 from blueyed/collecterror-fulltrace 
Respect --fulltrace with collection errors
 2019-11-21 00:27:23 +01:00
Daniel Hahler 2d449e95e4 Respect --fulltrace with collection errors 2019-11-20 23:35:33 +01:00
Ran Benita dac16cd9e5 Add type annotations to _pytest.config.argparsing and corresponding Config code 2019-11-20 22:02:27 +02:00
Daniel Hahler 2c941b5d13 parametrized: ids: support generator/iterator 
Fixes https://github.com/pytest-dev/pytest/issues/759

- Adjust test_parametrized_ids_invalid_type, create list to convert tuples
  Ref: https://github.com/pytest-dev/pytest/issues/1857#issuecomment-552922498

- Changelog for int to str conversion
  Ref: https://github.com/pytest-dev/pytest/issues/1857#issuecomment-552932952
 2019-11-20 19:02:17 +01:00
Daniel Hahler c0b1a39192 minor: move internal _pformat_dispatch function 2019-11-20 17:57:14 +01:00
Ran Benita 51f9cd0e02 argparsing: remove "map_long_option" Action attribute support 
This feature was added in commit
007a77c2ba, but was never used in pytest
itself. A GitHub code search doesn't find any users either (only pytest
repo copies). It seems safe to clean up.
 2019-11-20 17:09:24 +02:00
Daniel Hahler 2228ccbfb4 pytester: reset log output in _match_lines (#70) 
This is necessary for when using e.g. `no_fnmatch_line` after it.
Factor it out into `_fail`.

(cherry picked from commit aade7ed0045ba32557ef8565cbab28a2c91053a7)

Ref: https://github.com/pytest-dev/pytest/pull/5914#issuecomment-549182242
 2019-11-20 05:24:18 +01:00
Bruno Oliveira 5b3867fd65
Release 5.3.0 (#6233) 
Release 5.3.0
 2019-11-19 18:49:14 -03:00
Daniel Hahler 1d368e0ed4
Merge pull request #6231 from blueyed/param-spell 
Improve check for misspelling of parametrize
 2019-11-19 17:57:28 +01:00
Anthony Sottile faea273c93 Revert "A warning is now issued when assertions are made for `None`" 2019-11-19 08:24:08 -08:00
Bruno Oliveira 21622d0df4 Merge remote-tracking branch 'upstream/master' into release-5.3.0 2019-11-19 12:42:11 -03:00
Daniel Hahler 4ad61cbcf6 Improve check for misspelling of parametrize 
- there is no need to do this with `--strict-markers`
- it can be done when looking up marks, instead of for every generated
  test
 2019-11-19 16:05:52 +01:00
Daniel Hahler d1e2d12b3f
python: remove unused pytest_make_parametrize_id hookimpl (#6228) 2019-11-19 02:55:24 +01:00
Daniel Hahler 4804d4bc98 python: remove unused pytest_make_parametrize_id hookimpl 
Added in 79927428d initially, but never used.
 2019-11-19 02:27:53 +01:00
Daniel Hahler b820b7e384
Merge pull request #6224 from blueyed/visit_Assert-minor-cleanup 
minor: visit_Assert: move setting of `negation` out of branches
 2019-11-19 01:11:53 +01:00
Anthony Sottile eeeb19626b
Merge pull request #6202 from linw1995/fix_getmodpath 
Fix incorrect result of getmodpath method.
 2019-11-18 15:14:52 -08:00
Daniel Hahler f38f2d402e minor: visit_Assert: move setting of `negation` out of branches 2019-11-18 23:21:00 +01:00
Bruno Oliveira 89eeefbbaf
Merge pull request #6192 from nicoddemus/remove-reportlog-6180 
Remove report_log in favor of pytest-reportlog
 2019-11-18 17:58:37 -03:00
Daniel Hahler 2ad2fbc9a2 Metafunc: remove hack for DefinitionMock 
Done initially in 99015bfc8.
 2019-11-18 18:19:34 +01:00
Daniel Hahler 64d8910516
Metafunc: remove unused _ids (#6220) 2019-11-18 18:00:29 +01:00
Daniel Hahler 91dec8e2bf Factor out _validate_parametrize_spelling 
This makes it easier to read `pytest_generate_tests`.
 2019-11-18 16:36:12 +01:00
Daniel Hahler f3a10245d0 Metafunc: remove unused _ids 
Forgotten in 40b85d7ee.
 2019-11-18 16:21:13 +01:00
Daniel Hahler 426a4cdca9 _idval: remove trailing newline from exception 2019-11-18 01:10:00 +01:00
JoshKarpel 9e759010d9 resolve #2049 2019-11-17 16:45:42 -06:00
Anthony Sottile a2d48332fc
Merge pull request #6201 from asottile/mm 
Merge master into features
 2019-11-17 11:30:51 -08:00
Ran Benita fa578d7329
Merge pull request #6205 from bluetech/type-annotations-8 
Add type annotations to _pytest.compat and _pytest._code.code
 2019-11-17 09:45:32 +02:00
Ran Benita eaa34a9df0 Add type annotations to _pytest._code.code 2019-11-16 22:29:57 +02:00
Daniel Hahler 54a954514b re-run black 2019-11-16 18:55:32 +01:00
Daniel Hahler b1a597ab02 Remove (now) unnecessary fmt: off 2019-11-16 18:51:02 +01:00
Daniel Hahler 786d839db1 cacheprovider: set: use json.dumps + write 
``json.dump`` is slower since it iterates over chunks [1].

For 100 ``cache.set`` calls this saved ~0.5s (2.5s => 2s), using a dict
with 1500 entries, and an encoded size of 500kb.

Python 3.7.4.

1: https://github.com/blueyed/cpython/blob/1c2e81ed00/Lib/json/__init__.py#L177-L180
 2019-11-16 17:40:56 +01:00
Ran Benita 562d4811d5 Add type annotations to _pytest.compat 2019-11-16 17:22:11 +02:00
Ran Benita a649f157de Make Source explicitly implement __iter__() 
Source was previously iterable because it implements `__getitem__()`,
which is apparently a thing from before `__iter__()` was introduced.
To reduce mypy's and my own confusion, implement `__iter__()` directly.
 2019-11-16 17:22:10 +02:00
Ran Benita 307add025b Simplify a FormattedExcinfo test 
The previous test was better in that it used fakes to test all of the
real code paths. The problem with that is that it makes it impossible to
simplify the code with `isinstance` checks. So let's just simulate the
issue directly with a monkeypatch.
 2019-11-16 17:22:09 +02:00
Ran Benita e3ac44df36 Inline the FuncargnamesCompatAttr compat helper 
It doesn't help much IMO, just adds indirection and makes it harder to
type.
 2019-11-16 17:22:09 +02:00
Ran Benita 04d68fbc9e Remove checks for Python2-only fields im_func and func_code 2019-11-16 17:22:07 +02:00
Ran Benita f760356578 A few linting fixes 
Add some Python 3.8 type: ignores; all are already fixed in the next
mypy release, so can be removed once we upgrade.

Also move some flake8 ignores which seem to have changed places.
 2019-11-16 17:22:06 +02:00
林玮 329f56ecec Fix incorrect result of getmodpath method. 2019-11-16 15:28:04 +08:00
Anthony Sottile cc78444c30 Merge remote-tracking branch 'origin/master' into mm 2019-11-15 15:26:57 -08:00
Daniel Hahler c49c61fdaf
Import Path from _pytest.pathlib for py35 (#6193) 2019-11-15 23:17:43 +01:00
Daniel Hahler 5979837c60 Import Path from _pytest.pathlib for py35 
This is important for `isinstance` checks etc.
 2019-11-15 22:19:53 +01:00
Anthony Sottile 176c7771fb Revert "fix bug with nonskipped first test in package (#5831)" 
This reverts commit 85288b5321, reversing
changes made to 5f9db8a017.
 2019-11-15 08:29:52 -08:00
Bruno Oliveira d2ea9e2db5 Remove report_log in favor of pytest-reportlog 
Fix #6180
 2019-11-14 19:47:26 -03:00
Bruno Oliveira 99f487864c
Issue a warning to prepare change of 'junit_family' default val… (#6186) 
Issue a warning to prepare change of 'junit_family' default value
 2019-11-14 18:11:10 -03:00
Daniel Hahler 2fc7d04fc3
Merge pull request #6187 from blueyed/minor 
Minor fixes
 2019-11-14 00:45:54 +01:00
Bruno Oliveira 6f2c0fd2e8 Show a better message when 'request' is used in parametrize 
Fix #6183
 2019-11-13 19:57:10 -03:00
Bruno Oliveira 2a67637acc Issue a warning to prepare change of 'junit_family' default value 
Fix #6179
 2019-11-13 19:55:13 -03:00
Daniel Hahler 772dfc4f9d terminal: fix/remove wrong typing for currentfspath 
Can be -2, or py.path.local (not typed).
 2019-11-13 23:24:24 +01:00
Daniel Hahler 55bc084dcc doc: s/_pytest.config.Parser/_pytest.config.argparsing.Parser/ 2019-11-13 23:22:25 +01:00
Daniel Hahler b3bb604683 fix typo in _issue_warning_captured doc 2019-11-13 23:22:25 +01:00
Daniel Hahler f91bf48a40
Merge pull request #6176 from blueyed/assertoutcome 
pytester: Hookrecorder: improve assertoutcome
 2019-11-13 19:27:18 +01:00
Daniel Hahler b06f33f474 terminal: report ``session.shouldfail`` reason (``-x``) 
Via https://github.com/blueyed/pytest/pull/108.
 2019-11-13 16:18:41 +01:00
Daniel Hahler 6ddf7c3d42 pytester: Hookrecorder: improve assertoutcome 
Before:

        def assertoutcome(self, passed: int = 0, skipped: int = 0, failed: int = 0) -> None:
            realpassed, realskipped, realfailed = self.listoutcomes()
            assert passed == len(realpassed)
    >       assert skipped == len(realskipped)
    E       assert 1 == 0
    E        +  where 0 = len([])

After:

    >       reprec = testdir.inline_run(testpath, "-s")
    E       AssertionError: ([], [], [<TestReport 'nodeid' when='call' outcome='failed'>])
    E       assert {'failed': 1, 'passed': 0, 'skipped': 0} == {'failed': 0, 'passed': 0, 'skipped': 1}
 2019-11-13 13:48:20 +01:00
Daniel Hahler e2022a6d48
pytester: assert_outcomes: use/set __tracebackhide__ (#6172) 2019-11-12 23:07:58 +01:00
Bruno Oliveira 59369651db Bring back explicit tear down 
Otherwise 'normal' failures won't call teardown explicitly
 2019-11-12 14:03:40 -03:00
Bruno Oliveira f7b1de70c0 No need to call tearDown on expected failures 
- Isolate logic for getting expected exceptions
- Use original method name, as users see it when entering the debugger
 2019-11-12 12:50:55 -03:00
Daniel Hahler 86e9ae39f0 pytester: assert_outcomes: use/set __tracebackhide__ 2019-11-12 15:28:36 +01:00
Daniel Hahler dad4985be1
A bit more typing around Node (#6167) 2019-11-12 14:46:05 +01:00
Ran Benita b352e34938
Merge pull request #6149 from bluetech/cached-property 
Add a @cached_property implementation
 2019-11-10 22:11:04 +02:00
Daniel Hahler 3ef8aa8173 A bit more typing around Node 2019-11-10 19:06:27 +01:00
Daniel Hahler abcedd6095
_compare_eq_iterable: use AlwaysDispatchingPrettyPrinter (#6151) 2019-11-10 14:08:25 +01:00
Ran Benita 42a46ea786 Add a @cached_property implementation 
This is a useful utility to abstract the caching property idiom.

It is in compat.py since eventually it will be replaced by
functools.cached_property.

Fixes #6131.
 2019-11-10 10:21:55 +02:00
Daniel Hahler 04f27d4eb4 unittest: do not use TestCase.debug() with `--pdb` 
Fixes https://github.com/pytest-dev/pytest/issues/5991
Fixes https://github.com/pytest-dev/pytest/issues/3823

Ref: https://github.com/pytest-dev/pytest-django/issues/772
Ref: https://github.com/pytest-dev/pytest/pull/1890
Ref: https://github.com/pytest-dev/pytest-django/pull/782

- inject wrapped testMethod

- adjust test_trial_error

- add test for `--trace` with unittests
 2019-11-10 00:21:51 +01:00
Daniel Hahler 710e3c40e0
typing around terminal (#6157) 2019-11-10 00:19:11 +01:00
Daniel Hahler 0bbc032db0 [WIP] typing around terminal 2019-11-09 23:53:37 +01:00
Daniel Hahler 28edbaace4 showversion: no need for `py.path.local` 2019-11-09 21:45:35 +01:00
Bruno Oliveira 245e1f10e5
Merge pull request #6152 from grlee77/module_name_in_id 
use __name__ attribute in the parametrize id for modules as well
 2019-11-08 14:16:34 -03:00
Ran Benita 84b2c81db4 Drop the "alias" helper used in MarkDecorator 
It is a little too obscure IMO, but the reason I want to drop it is that
type checking has no hope of understanding such dynamic constructs.

The warning argument wasn't used.
 2019-11-08 11:22:46 +02:00
Ran Benita 984d90a811 Drop redundant custom MarkDecorator __eq__ implementation 
This is already covered by attrs.

Also, the custom implementation returns False when the types don't
match, but it's better to return `NotImplemented`. attrs does this.
 2019-11-08 11:14:31 +02:00
Gregory Lee c22ce1a12c parametrize: allow __name__ id for modules or other objects as well 2019-11-08 01:39:29 -05:00
Daniel Hahler cc503c1821 _compare_eq_iterable: use AlwaysDispatchingPrettyPrinter 
This fixes/removes the previous hack of re-trying with minimum width,
which fails short when it splits strings.

This inherits from `pprint.PrettyPrinter` to override `_format` in a
minimal way to always dispatch, regardless of the given width.

Code ref: 5c0c325453/Lib/pprint.py (L170-L178)
 2019-11-08 04:07:09 +01:00
Bruno Oliveira 6ad95716da
add --co option to collect-only (#6116) 
add --co option to collect-only
 2019-11-07 19:03:32 -03:00
Bruno Oliveira 3b243404e6
Explicitly implement pytest_assertrepr_compare in assertion plu… (#6140) 
Explicitly implement pytest_assertrepr_compare in assertion plugin
 2019-11-07 18:45:26 -03:00
Daniel Hahler 09709bba06
Use atomicrewrites only on Windows (#6148) 2019-11-07 22:13:26 +01:00
Bruno Oliveira 7ed33996f1
on_rm_rf_error: ignore os.open (no warning) (#6074) 
on_rm_rf_error: ignore os.open (no warning)
 2019-11-07 18:06:05 -03:00
Bruno Oliveira 0cf2002a1f Explicitly implement pytest_assertrepr_compare in assertion plugin 
Previously it was an alias, which makes it unnecessary hard to find
all implementations (either by IDE or using a simple search).
 2019-11-07 18:00:27 -03:00
NNRepos 4946cc8282 Add --co option to collect-only 
Fix #5845
 2019-11-07 17:50:27 -03:00
Daniel Hahler 45c4a8fb3d Use atomicrewrites only on Windows 
Fixes https://github.com/pytest-dev/pytest/issues/6147
 2019-11-07 20:57:45 +01:00
Ran Benita e670ff76cb
Merge pull request #6141 from bluetech/type-annotations-7 
Add type annotations to _pytest.{warning_types,_code.source,pytester}
 2019-11-07 17:11:01 +02:00
Daniel Hahler f11237b066
_perform_collect: remove comment about untested code (#6144) 2019-11-07 13:18:08 +01:00
Ran Benita 265a9eb6a2 Add type annotations to some of _pytest.pytester 2019-11-07 14:13:47 +02:00
Ran Benita 58f2849bf6 Add type annotations to _pytest._code.source 
At least most of it.
 2019-11-07 14:13:47 +02:00
Ran Benita b2537b22d7 Add type annotations to _pytest.warning_types 2019-11-07 14:11:39 +02:00
Daniel Hahler 2e5cf1cc78 Fix order of format args with warning 2019-11-07 12:50:04 +01:00
Daniel Hahler 8aa0809fbc on_rm_rf_error: ignore os.open (no warning) 
Ref: https://github.com/pytest-dev/pytest/pull/6044/files#r339321752
 2019-11-07 12:50:04 +01:00
Daniel Hahler ab101658f0
saferepr: handle BaseExceptions (#6047) 2019-11-07 12:33:22 +01:00
Daniel Hahler b268463243
Merge master into features (#6111) 2019-11-07 12:31:33 +01:00
Daniel Hahler dd852ded70 _perform_collect: remove comment about untested code 
Harden one test where it is tested.

All tests testing this:

    testing/acceptance_test.py:184(TestGeneralUsage::test_not_collectable_arguments)
    testing/acceptance_test.py:373(TestGeneralUsage::test_direct_addressing_notfound)
    testing/acceptance_test.py:403(TestGeneralUsage::test_issue134_report_error_when_collecting_member[test_fun.py::test_a])
    testing/acceptance_test.py:420(TestGeneralUsage::test_report_all_failed_collections_initargs)
    testing/test_config.py:1309(test_config_blocked_default_plugins[python])

(via https://github.com/blueyed/pytest/pull/88)
 2019-11-07 12:29:36 +01:00
Daniel Hahler c4a110b20a Session: collect: keep/use already parsed initialpart 
Via https://github.com/blueyed/pytest/pull/42.
 2019-11-06 22:09:24 +01:00
Daniel Hahler eb7a4e32ad saferepr: handle BaseExceptions 
This causes INTERNALERRORs with pytest-django, which uses
`pytest.fail` (derived from `BaseException`) to prevent DB access, when
pytest then tries to e.g. display the `repr()` for a Django `QuerySet`
etc.

Ref: https://github.com/pytest-dev/pytest-django/pull/776
 2019-11-06 22:08:10 +01:00
Daniel Hahler fe429d4ce8
assert: fix _compare_eq_iterable: re-format both sides (#6137) 2019-11-06 22:06:39 +01:00
Bruno Oliveira 85288b5321
fix bug with nonskipped first test in package (#5831) 
fix bug with nonskipped first test in package
 2019-11-06 16:06:46 -03:00
Bruno Oliveira 74f4ec5986
Making it possible to access the pluginmanager in the pytest_ad… (#6106) 
Making it possible to access the pluginmanager in the pytest_addoptio…
 2019-11-06 15:18:59 -03:00
Daniel Hahler 4e45472405 Merge master into features 
Conflicts:
	src/_pytest/debugging.py
 2019-11-06 14:22:07 +01:00
Daniel Hahler 01769b141a
Merge pull request #6100 from blueyed/fix-skip-offset 
terminal: fix line offset with skip reports
 2019-11-06 13:29:40 +01:00
Daniel Hahler 9071a2a5e0
Merge pull request #6119 from blueyed/FSCollector-fspath 
FSCollector: keep/use given fspath
 2019-11-06 13:10:27 +01:00
Daniel Hahler ce3d431002 assert: fix _compare_eq_iterable: re-format both sides 
Follow-up to 946434c61 (#5924).

Before this patch the test would look like this:

    {'env': {'sub...s wrapped'}}}} == {'env': {'sub...}}}, 'new': 1}
    Omitting 1 identical items, use -vv to show
    Right contains 1 more item:
    {'new': 1}
    Full diff:
      {
       'env': {'sub': {'long_a': 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
    -                  'sub1': {'long_a': 'substring '
    +                  'sub1': {'long_a': 'substring that gets wrapped'}}},
    ?                                                +++++++++++++++++ ++++
    +  'new': 1,
    -                                     'that '
    -                                     'gets '
    -                                     'wrapped'}}},
      }
 2019-11-06 11:23:15 +01:00
Daniel Hahler e7320c6b54
Merge pull request #5926 from AtakamaLLC/optional-multiline 
Add log-auto-indent option to control multiline formatting
 2019-11-06 00:35:24 +01:00
Daniel Hahler 00f67494e5
Merge pull request #6107 from MarcoGorelli/color-percentage-indicator 
Color percentage indicator
 2019-11-06 00:28:45 +01:00
Daniel Hahler 741f0fedd1 typing around Node.location, reportinfo, repr_excinfo etc 2019-11-05 16:22:58 +01:00
Zak Hassan f9e3a5395c Removing variable being reassigned 2019-11-04 21:11:54 -05:00
MarcoGorelli 0d79061432 Color percentage indicator according to color of final line 
indicate current outcome/status with color of percentage indicator

Fix type annotation, refactor _write_progress_information_filling_space

Keep code in _get_main_color as similar as possible to how it was before

Write test

Make black-compliant

Fix error in newly introduced test_collecterror

Make tests more readable by using constants and f-strings

Remove accidentally added monkeypatch

Make Python 3.5-compatible, add changelog entry

Add newline at the end of changelog file
 2019-11-04 19:57:07 +00:00
Ran Benita 7d3ce374d2 Add type annotations to _pytest.assertion.util 2019-11-03 20:28:43 +02:00
Ran Benita 18d181fa77 Remove dead code in _pytest.assertion.util._diff_text 
The function handles bytes input, however that is never used.
The function has two callers:

1)

```
            if istext(left) and istext(right):
                explanation = _diff_text(left, right, verbose
```

`istext` checks `isinstance(str)`.

2)

```
def _notin_text(term: str, text: str, verbose: int = 0) -> List[str]:
    ...
    diff = _diff_text(correct_text, text, verbose
```

and `_notin_text` is called once:

```
            if istext(left) and istext(right):
                explanation = _notin_text(left, right, verbose
```
 2019-11-03 20:28:43 +02:00
Ran Benita dc30d78845 Add type annotations to _pytest._io.saferepr 2019-11-03 20:28:43 +02:00
Daniel Hahler 3fb969897a
Merge pull request #6059 from blueyed/collect-error-short-summary 
terminal: report collection errors as "ERROR" in short summary
 2019-11-02 15:34:12 +01:00
Daniel Hahler 0c7c26fe6e FSCollector: keep/use given fspath 
Via https://github.com/blueyed/pytest/pull/42.
 2019-11-02 10:02:23 +01:00
Florian Bruhin 35800a2f73
Merge pull request #6112 from gaucheph/fix-small-typo 
typos
 2019-11-01 11:18:06 +01:00
Patrick Harmon abc890079f typos 2019-10-31 23:19:35 -05:00
David Szotten 285524c6cd Fix --trace for parametrized tests 
Without this, the second time it tries to stop in a parametrized
function it raises instead:

`ValueError: --trace can't be used with a fixture named func!`

Implementation idea, test (and changelog tweaks) thanks to blueyed

Co-Authored-By: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Co-Authored-By: Daniel Hahler <git@thequod.de>
 2019-10-31 21:41:33 +00:00
Joshua Storck 7a96d94fd4 Making it possible to access the pluginmanager in the pytest_addoption hook 2019-10-30 14:18:13 -04:00
Bruno Oliveira 09096f7436 Remove 'experimental' status from report serialization hooks 2019-10-30 09:43:33 -03:00
Bruno Oliveira b99661b9d7 Introduce --report-log option 
Fix #4488
 2019-10-30 09:43:33 -03:00
Daniel Hahler 6d2cabae57 terminal: fix line offset with skip reports 
The original fix in https://github.com/pytest-dev/pytest/pull/2548 was
wrong, and was likely meant to fix the use with decorators instead,
which this does now (while reverting 869eed9898).
 2019-10-29 13:11:02 +01:00
Daniel Hahler cdc53da19c
Merge pull request #5990 from MarcoGorelli/plurality-matching 
Plurality matching
 2019-10-28 17:03:15 +01:00
Ran Benita 7f8bf4d9f6
Merge pull request #6066 from bluetech/type-annotations-paths 
Add type annotations to _pytest.pathlib and _pytest.tmpdir
 2019-10-28 15:20:45 +02:00
Daniel Hahler ec27363748
Merge pull request #6025 from blueyed/pytester-typing 
pytester: typing
 2019-10-28 05:31:31 +01:00
Daniel Hahler 716f532a38
Merge pull request #6070 from blueyed/pexpect-freebsd 
pytester: spawn: do not skip FreeBSD
 2019-10-28 05:13:31 +01:00
MarcoGorelli d863c30c74 Fix plurality mismatch for and in pytest terminal summary 2019-10-27 15:16:24 +00:00
Daniel Hahler 886a3ad609 pytester: typing 2019-10-27 12:32:14 +01:00
Daniel Hahler a4faac6c94 mark: move pytest_cmdline_main.tryfist into decorator 
Avoids comments for ignored typing.
 2019-10-27 06:01:18 +01:00
Daniel Hahler 7f1af84f47 Merge master into features 
Conflicts:
	src/_pytest/logging.py
 2019-10-27 02:06:36 +01:00
Daniel Hahler 8e8a8fa4b9 pytester: spawn: do not skip FreeBSD 
Fixes https://github.com/pytest-dev/pytest/issues/6069
 2019-10-27 00:44:25 +02:00
Ran Benita 00a278cdb4 Add type annotations to _pytest.tmpdir 
At least the ones I was able to.
 2019-10-26 20:30:44 +03:00
Ran Benita 59a59f371b Add type annotations to _pytest.pathlib 
At least the ones I was sure of.
 2019-10-26 20:08:36 +03:00
Bruno Oliveira 6f20b4b014 Introduce compat.fspath 2019-10-26 10:37:44 -03:00
Ran Benita 0b8c35516f Replace py.io.TextIO with io.StringIO 
In Python3, py.io.TextIO is just an alias to io.StringIO. Remove the
indirection.
 2019-10-26 16:33:57 +03:00
Bruno Oliveira f93f284356 Support sys.pycache_prefix on py38 
Fix #4730
 2019-10-26 10:17:21 -03:00
Kale Kundert b9df9a4761
Merge pull request #6058 from AnjoMan/6057-tolerance-on-complex-approx 
6057 tolerance on complex approx
 2019-10-25 15:31:47 -04:00
Anton Lodder 3c7fbe2d8b Document evaluating complex number for infinity 2019-10-25 12:03:03 -04:00
Michael Krebs 1f5b454355 Add log-auto-indent option to control multiline formatting 2019-10-25 11:31:33 -04:00
Daniel Hahler 82753bec50 terminal: report collection errors as "ERROR" in short summary 2019-10-25 07:03:32 +02:00
AnjoMan ed9fda84d3 Add tolerance to complex numbers 2019-10-24 23:44:13 -04:00
Bruno Oliveira fb0e8b99d1 Merge remote-tracking branch 'upstream/master' into mm 
Conflicts:
- 	src/_pytest/cacheprovider.py
 2019-10-24 21:13:43 -03:00
Bruno Oliveira d1bc2601e4
pytester: align prefixes (#6026) 
pytester: align prefixes
 2019-10-24 18:50:29 -03:00
Daniel Hahler 8ef4287bf0 pytester: align prefixes 
This is important for using another match_nickname, e.g. "re.match".

TODO:

- [ ] changelog
- [ ] test
 2019-10-24 23:20:12 +02:00
Bruno Oliveira 432e5550e5
assertrepr_compare: use safeformat with -vv (#5936) 
assertrepr_compare: use safeformat with -vv
 2019-10-23 19:51:40 -03:00
Daniel Hahler 8316d4392a
Merge pull request #6028 from blueyed/DontReadFromInput-msg 
capture: improve message with DontReadFromInput's IOError
 2019-10-23 22:48:15 +02:00
Ran Benita 7a2d2d8f07
Merge pull request #5847 from bluetech/type-annotations-4 
2/X Fix check_untyped_defs = True mypy errors
 2019-10-23 22:52:23 +03:00
Daniel Hahler 6242777818
Merge pull request #6041 from blueyed/pytester-splitlines 
pytester: runpytest_inprocess: use splitlines()
 2019-10-23 21:42:21 +02:00
Bruno Oliveira 20ee883b5f
Show the mnemonic of pytest.ExitCode in RunResult's repr (#6043) 
Show the mnemonic of pytest.ExitCode in RunResult's repr
 2019-10-23 10:46:58 -03:00
Bruno Oliveira 7beb520555 Show the mnemonic of pytest.ExitCode in RunResult's repr 
Fix #4901
 2019-10-23 09:16:02 -03:00
Ran Benita 1cc1ac5183 Remove some type: ignores fixed in typeshed 2019-10-23 14:47:56 +03:00
Bruno Oliveira ba4b8c869c Review rm_rf handling of FileNotFoundErrors 2019-10-23 08:30:52 -03:00
Ran Benita 1787bffda0 Fix check_untyped_defs errors in capture 2019-10-23 14:20:15 +03:00
Ran Benita 0267b25c66 Fix some check_untyped_defs mypy errors in terminal 2019-10-23 14:20:15 +03:00
Ran Benita 5dca7a2f4f Fix check_untyped_defs errors in cacheprovider 2019-10-23 14:20:15 +03:00
Ran Benita 93c8822f26 Fix check_untyped_defs errors in warnings 2019-10-23 14:20:15 +03:00
Ran Benita 583c2a2f9b Fix check_untyped_defs errors in logging 2019-10-23 14:20:15 +03:00
Ran Benita 1984c10427 Fix check_untyped_defs errors in doctest 
In order to make the LiteralOutputChecker lazy initialization more
amenable to type checking, I changed it to match the scheme already used
in this file to lazy-initialize PytestDoctestRunner.
 2019-10-23 14:20:14 +03:00
Ran Benita 3246d8a6e9
Merge pull request #6048 from bluetech/mypy-0.740 
Update mypy 0.720 -> 0.740
 2019-10-23 12:47:21 +03:00
Daniel Hahler b30e7bd1de
Merge pull request #6045 from blueyed/minor 
minor: typing for ReprFailDoctest
 2019-10-23 11:44:37 +02:00