p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,340 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

12340 Commits

Author SHA1 Message Date
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
Nathaniel Compton 7c09d88b72
#6289: Add new example to XFAIL documentation (#6685) 
Fix #6289

Co-authored-by: Ran Benita <ran234@gmail.com>
 2020-02-19 15:04:37 -03: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 442f7a7706
Do not use fixed line number with test_cache_failure_warns (#6748) 
It was not previously checking for the line number also (02aa8ad), and this is
obviously wrong (affected by changes to the file).
 2020-02-18 09:27:33 +01:00
Daniel Hahler d18c75baa3
doc: fix test with link to `python_files` (#6741) 
Follow-up to b09762d (#6705).

Ref: https://github.com/pytest-dev/pytest/pull/6705#discussion_r379819573
 2020-02-16 10:30:25 +01: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
kpinc 9785ee438d
doc: expand first sentence on fixtures into a paragraph (#6742) 2020-02-15 18:35:36 +01:00
Ran Benita 959e6b4f44
Merge pull request #6743 from bluetech/runtest-getattr 
Avoid getattr when dispatching pytest_runtest_* hooks
 2020-02-15 17:22:00 +02:00
Ran Benita 5945c3fe88 Type annotate Metafunc 2020-02-15 17:13:18 +02:00
Ran Benita 7155b2277c Ignore "assert False" statements in coverage 2020-02-15 17:08:01 +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 7fc9d4c976
Use warnings module directly with cacheprovider (#6740) 2020-02-15 05:31:18 +01:00
Daniel Hahler 2b5adc88a7 Move test_issue4445_cacheprovider_set into test_cache_failure_warns 
Would need to be adjusted anyway non-trivially, and we can just harden
`test_cache_failure_warns` instead.
 2020-02-15 02:01:22 +01: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 67e69a7e49
tests: harden test_xdist_verbose (#6700) 2020-02-15 01:22:01 +01:00
Daniel Hahler b09762df27
doc: link to `python_files` from "Assertion Rewriting" (#6705) 
Ref: https://github.com/pytest-dev/pytest/issues/6377
Ref: https://github.com/blueyed/pytest/pull/145
 2020-02-15 00:32:16 +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
Daniel Hahler 4b70ba2c21
tests: harden test_better_reporting_on_conftest_load_failure (#6713) 2020-02-14 17:00:01 +01:00
Daniel Hahler de3353aac1
test_load_initial_conftest_last_ordering: handle testing package (#6706) 2020-02-14 16:58:17 +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 83137c89e9
tests: test_unicode_plus_minus: use unicode sign directly (#6727) 
Was globbed for Python 2 before (57c448991).
 2020-02-14 02:16:25 +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 56a5dbe252
Merge pull request #6722 from bluetech/rm-callspec2-global 
Remove unused CallSpec2 fields _globalid, _globalparam
 2020-02-13 12:49:41 +02: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
Bruno Oliveira d79179a239
Merge pull request #6716 from bluetech/features-to-master-for-real 
Merge the features branch into master, before stopping to use it
 2020-02-12 11:52:32 -03: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 aa4d80cad9
RFC: Streamlining pytest's git workflow (#6571) 
RFC: Streamlining pytest's git workflow
 2020-02-12 08:37:14 -03: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
Ran Benita c3e53a072d Switch to new git workflow 
Co-Authored-By: Daniel Hahler <git@thequod.de>
 2020-02-12 09:49:21 +02:00
Daniel Hahler fa877665ad _set_main_color: does not need to return 2020-02-12 03:11:54 +01:00
Bruno Oliveira 3b582858f3
Merge pull request #6712 from nicoddemus/mm 
Merge master into features
 2020-02-11 20:22:20 -03: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