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

187 Commits

Author SHA1 Message Date
Ran Benita 256a5d8b14 hookspec: improve typing of some remaining hooks 2020-06-25 17:33:21 +03:00
Bruno Oliveira ab6dacf1d1
Introduce --import-mode=importlib (#7246) 
Fix #5821

Co-authored-by: Ran Benita <ran@unusedvar.com>
 2020-06-13 11:29:01 -03:00
Ran Benita f551cab877
Merge pull request #7358 from bluetech/typing2 
More type annotations, fix some typing bugs
 2020-06-13 10:44:11 +03:00
Bruno Oliveira aaa6f1c3fa
Merge pull request #7330 from gnikonorov/issue_7305 2020-06-12 19:35:38 -03:00
Ran Benita 1cf9405075 Fix some type errors around py.path.local 
These errors are found using a typed version of py.path.local.
 2020-06-12 17:34:31 +03:00
Prashant Anand e78207c936
7119: data loss with mistyped --basetemp (#7170) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
Co-authored-by: Ran Benita <ran@unusedvar.com>
 2020-06-08 21:54:22 -03:00
Fabio Zadrozny 322190fd84
Fix issue where working dir becomes wrong on subst drive on Windows. Fixes #5965 (#6523) 
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2020-06-08 10:56:40 -03:00
Gleb Nikonorov 3f6b3e7faa update help for --strict-config 2020-06-06 11:33:28 -04:00
Ran Benita 90e58f8961 Type annotate some parts related to runner & reports 2020-06-05 11:34:20 +03:00
Ran Benita e68a26199c Type annotate misc functions 2020-06-05 11:34:19 +03:00
Ran Benita 247c4c0482 Type annotate some more hooks & impls 2020-06-05 11:34:19 +03:00
Ran Benita be00e12d47 Type annotate main.py and some parts related to collection 2020-06-05 11:34:19 +03:00
Gleb Nikonorov db203afba3 Add in --strict-config flag to force warnings to errors 2020-05-31 02:45:40 -04:00
Ran Benita 59a12e9ab3 Replace bare `except`s with `except BaseException` 
Mostly I wanted to remove uses of `noqa`.

In Python 3 the two are the same.
 2020-05-12 09:29:47 +03:00
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
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 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 260f848c05 minor: remove outdated, superfluous comment 2020-02-22 13:15:17 +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
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
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 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
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
Ran Benita a435faad5c Merge branch 'master' into master-to-features 2020-01-31 11:27:06 +02:00
Daniel Hahler 88b800355a typing: pytest_collection 2020-01-30 19:58:43 +01: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
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 e2934c3f8c Move common code between Session and Package to FSCollector 2020-01-25 19:04:01 +01:00
Daniel Hahler 9b8039cf09 Sync `{Session,Package}._recurse` 2020-01-25 16:44:20 +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
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 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 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
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
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
Ran Benita 930a158a6a Fix type errors after adding types to the `py` dependency 2020-01-19 14:48:24 +02:00
Daniel Hahler 956389fa8c Session._fixturemanager 2020-01-19 11:21:16 +01:00
Bruno Oliveira 59f95b7f59 Merge remote-tracking branch 'upstream/master' into mm 2019-12-03 11:07:34 -03:00
Daniel Hahler bc7282576f typing: minor improvements 2019-11-24 23:20:03 +01:00
Ronny Pfannschmidt c99c7d0f95 deprecate direct node construction and introduce Node.from_parent 2019-11-23 21:54:11 +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
NNRepos 4946cc8282 Add --co option to collect-only 
Fix #5845
 2019-11-07 17:50:27 -03:00
Daniel Hahler f11237b066
_perform_collect: remove comment about untested code (#6144) 2019-11-07 13:18:08 +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 4e45472405 Merge master into features 
Conflicts:
	src/_pytest/debugging.py
 2019-11-06 14:22:07 +01:00
Daniel Hahler 741f0fedd1 typing around Node.location, reportinfo, repr_excinfo etc 2019-11-05 16:22:58 +01:00
Patrick Harmon abc890079f typos 2019-10-31 23:19:35 -05:00
MarcoGorelli d863c30c74 Fix plurality mismatch for and in pytest terminal summary 2019-10-27 15:16:24 +00:00
Bruno Oliveira 0383d43645 Add missing version added/changed markers to docs 
Notice some features since 5.0 were not being properly
marked in which version they have been added/changed.
 2019-10-15 19:45:58 -03:00
Daniel Hahler aa06e6c8f3 Merge master into features 2019-08-05 19:12:32 +02:00
Daniel Hahler 198fcd8a6f Fix RuntimeError when trying to collect package with "__init__.py" only 
Fixes https://github.com/pytest-dev/pytest/issues/4344.
 2019-08-05 17:52:21 +02:00
Bruno Oliveira 7e58defc15 Remove 'pytest.config' 2019-06-30 13:18:07 -03:00
Anthony Sottile 3e0e31a364 Don't crash with --pyargs and a filename that looks like a module 2019-06-27 08:32:32 -07:00
Anthony Sottile 4cd08f9b52 Switch from deprecated imp to importlib 2019-06-24 09:48:38 -07:00
Ronny Pfannschmidt 0627d92df2 fix typos in the resolution of #5125 2019-06-17 20:35:23 +02:00
Bruno Oliveira ab6ed381ac Improve ExitCode docstring 2019-06-15 20:53:46 -03:00
Ronny Pfannschmidt 8b3b10b14b pre-commit 2019-06-15 17:41:13 +02:00
Ronny Pfannschmidt 103d6146b0 document exitcode members 2019-06-15 17:18:21 +02:00
Ronny Pfannschmidt 2b92fee1c3 initial conversion of exit codes to enum 2019-06-15 06:48:00 +02:00
Anthony Sottile a91fe1fedd pre-commit run pyupgrade --all-files 2019-06-03 12:08:02 -03:00
Anthony Sottile 3f1ec520fc pre-commit run reorder-python-imports --all-files 2019-06-03 12:08:01 -03:00
Anthony Sottile 5034399d7a pre-commit run fix-encoding-pragma --all-files 2019-06-03 12:08:01 -03:00
Bruno Oliveira 4d49ba6529 Drop Python 2.7 and 3.4 support 
* Update setup.py requires and classifiers
* Drop Python 2.7 and 3.4 from CI
* Update docs dropping 2.7 and 3.4 support
* Fix mock imports and remove tests related to pypi's mock module
* Add py27 and 34 support docs to the sidebar
* Remove usage of six from tmpdir
* Remove six.PY* code blocks
* Remove sys.version_info related code
* Cleanup compat
* Remove obsolete safe_str
* Remove obsolete __unicode__ methods
* Remove compat.PY35 and compat.PY36: not really needed anymore
* Remove unused UNICODE_TYPES
* Remove Jython specific code
* Remove some Python 2 references from docs

Related to #5275
 2019-06-02 14:39:11 -03:00
Anthony Sottile dc75b6af47 Use fix-encoding-pragma pre-commit hook 2019-05-14 15:56:31 -07:00
Bruno Oliveira 685ca96c71 Change ``--strict`` to ``--strict-markers``, preserving the old one 
Fix #5023
 2019-05-09 19:36:38 -03:00
Bruno Oliveira 3f5622c577
Use config_invocation_dir for startdirs (#5151) 
Use config_invocation_dir for startdirs
 2019-04-29 18:14:51 -03:00
Daniel Hahler 0bf363472e Use config_invocation_dir for startdirs 
`Session.startdir` and `TerminalReporter.startdir` appear to be
redundant given `Config.invocation_dir`.
Keep them for backward compatibility reasons, but use
`config.invocation_dir` for them.
 2019-04-22 02:05:59 +02:00
Daniel Hahler 649d23c8a8 pytest_sessionfinish: preset exitstatus with UsageErrors 
Previously it would be 0.  Setting it to the expected outcome
(EXIT_USAGEERROR) here already helps `pytest_sessionfinish` hooks.
 2019-04-18 23:18:59 +02:00
Daniel Hahler cc90bcce4c wrap_session: restore old behavior for initstate=1 2019-04-03 05:09:21 +02:00
Daniel Hahler 4148663706
Merge pull request #4979 from blueyed/minor 
Minor: whitespace, typo, docs
 2019-03-26 10:01:13 +01:00
Daniel Hahler aa0b657e58 Add Session.__repr__ 2019-03-24 11:02:58 +01:00
Daniel Hahler 5c26ba9cb1 minor: wrap_session: s/Spurious/unexpected/ 2019-03-22 13:23:44 +01:00
Daniel Hahler 553951c443 Fix some issues related to "-p no:X" with default_plugins 2019-03-21 17:01:50 +01:00
Daniel Hahler 0d31e852b1 Run isort 2019-03-01 14:24:18 +01:00
Bruno Oliveira 0395996756 Merge remote-tracking branch 'upstream/master' into release-4.3.0 2019-02-16 14:06:51 +00:00
Daniel Hahler 407d4a0cf0 collect: python: fix `AssertionError` with broken symlinks 
Fixes https://github.com/pytest-dev/pytest/issues/4782.
 2019-02-14 00:18:14 +01:00
Daniel Hahler 7b91952645 Merge master into features 
Conflicts:
	tox.ini
 2019-02-13 17:58:16 +01:00
Daniel Hahler 61b9246afe Fix/improve handling of pkg init and test file via args 
Ref: https://github.com/pytest-dev/pytest/issues/4344#issuecomment-441095934
 2019-02-11 15:04:24 +01:00
Daniel Hahler fc8800c71f
Merge pull request #4722 from fetzerch/ignore_wildcards 
Add ability to use globs when using --ignore
 2019-02-09 00:11:04 +01:00
Daniel Hahler b4b2f58eab
Merge pull request #4747 from blueyed/visit-filter 
pytest.main: collect: factor out _visit_filter
 2019-02-08 22:19:38 +01:00
Daniel Hahler 7bb504b807 pytest.main: collect: factor out _visit_filter 2019-02-08 19:28:12 +01:00
Daniel Hahler 913a2da6e5 Fix handling of collect_ignore from parent conftest 
`_collectfile` should be called on files only.

Fixes https://github.com/pytest-dev/pytest/issues/4592.
 2019-02-08 18:46:43 +01:00
Christian Fetzer 2dc2a19db5 Add ability to exclude files matching glob patterns in conftest.py 
This adds the `collect_ignore_glob` option for `conftest.py` to allow
Unix-style wildcards for excluding files.
 2019-02-06 16:49:43 +01:00
Christian Fetzer fc5d4654e5 Add ability to exclude files matching glob patterns with --ignore-glob 
This adds the `--ignore-glob` option to allow Unix-style wildcards so
that `--ignore-glob=integration*` excludes all tests that reside in
files starting with `integration`.

Fixes: #3711
 2019-02-06 11:29:30 +01:00
Daniel Hahler fc4aa27cae Derive outcomes.exit.Exception from SystemExit instead of KeyboardInterrupt 
This is required for properly getting out of pdb, where
KeyboardInterrupt is caught in py36 at least.

Ref: https://github.com/pytest-dev/pytest/issues/1865#issuecomment-242599949
 2018-12-11 04:22:33 +01:00
Anthony Sottile b88c3f8f82 Deprecate pytest.config 2018-12-03 09:01:42 -08:00
Ronny Pfannschmidt 88bf01a31e fix #4386 - restructure construction and partial state of ExceptionInfo 2018-11-22 21:20:32 +01:00
Bruno Oliveira 557cb6cffe Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-13 09:01:37 -02:00
Bruno Oliveira b6f16abfe0
Merge pull request #4369 from blueyed/cleanup 
Cleanup/follow-up to #4319
 2018-11-11 11:38:06 -02:00
Daniel Hahler a6ff5e6bfc Cleanup/follow-up to #4319 2018-11-11 01:38:34 +01:00
Daniel Hahler be15ad8d25 Fix collection of direct symlinked files not in python_files 
Fixes https://github.com/pytest-dev/pytest/issues/4325.
 2018-11-11 01:37:06 +01:00