cdc7e13067
pytester: clarify _makefile signature ( #6675 )
2020-02-05 20:42:57 +01:00
39d9f7cff5
pytester: LineMatcher: typing, docs, consecutive line matching ( #6653 )
2020-02-04 22:47:18 +01:00
632800add5
internal: clean up getfslineno ( #6656 )
2020-02-04 22:46:00 +01:00
bc494661ad
Remove testing/test_modimport.py ( #6666 )
2020-02-04 08:26:40 +01:00
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
4316fe8a92
testing/conftest.py: testdir: set PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 ( #6655 )
...
Fixes https://github.com/pytest-dev/pytest/pull/4518 .
2020-02-04 02:59:20 +01:00
aa0328782f
assertion: save/restore hooks on item ( #6646 )
2020-02-04 02:56:23 +01:00
9c7f1d9b32
Remove compat.getfslineno
2020-02-04 02:40:59 +01:00
dab90ef726
typing: fix getfslineno
...
Closes https://github.com/pytest-dev/pytest/pull/6590 .
2020-02-03 19:09:08 +01:00
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
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
1480aa31a7
Explicitly state on the PR template that we can squash commits ( #6662 )
...
* Explicitly state on the PR template that we can squash commits
This way we don't need to ask every time, and users who for some reason
would not like us to squash their commits can explicitly state so.
2020-02-03 14:35:50 -03:00
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
abffd16ce6
Keep (revisited) comment from https://github.com/pytest-dev/pytest/commit/4d31ea831
2020-02-03 14:04:16 +01:00
fb289667e3
Remove testing/test_modimport.py
...
testing/test_meta.py ensures this already as a side effect
(+ tests a few more (`__init__.py` files) and should have been
combined with it right away [1].
1: https://github.com/pytest-dev/pytest/pull/4510#discussion_r289123446
Ref: https://github.com/pytest-dev/pytest/commit/eaa05531e
Ref: https://github.com/pytest-dev/pytest/commit/4d31ea831
2020-02-03 13:58:32 +01:00
8ec4d03c91
Inline FunctionMixin with Function ( #6664 )
...
`Generator` was removed in 7eb28f9eb
2020-02-03 10:25:32 +01:00
c55bf23cbe
doc: s/pytest_mark/pytestmark ( #6661 )
2020-02-03 08:56:37 +01:00
99d162e44a
Handle `Exit` exception in `pytest_sessionfinish`
...
Similar to a7268aahttps://github.com/pytest-dev/pytest/pull/6258 ).
2020-02-02 23:13:23 +01:00
8bd612b367
typing: wrap_session
...
Pulled out of https://github.com/pytest-dev/pytest/pull/6556 .
2020-02-02 23:12:48 +01:00
5256542ea4
pytester.LineMatcher: add support for matching lines consecutively
2020-02-01 23:48:58 +01:00
50f81db817
revisit/improve docstrings
2020-02-01 23:48:58 +01:00
2681b0aed7
typing: pytester: LineMatcher
2020-02-01 23:48:57 +01:00
b10ab0211c
Use TypeError instead of AssertionError for no sequence
...
Improve/extends tests.
2020-02-01 23:48:57 +01:00
09a0e45492
testing/test_pytester.py: cosmetics
2020-02-01 23:48:57 +01:00
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
c9eeafade5
Fix favicon for Chrome and Opera ( #6639 )
...
* Fix favicon for Chrome and Opera
* Delete pytest1favi.ico
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2020-01-31 20:56:45 -03:00
39b25ddcf3
Remove deprecated 'pytest_itemstart' hook ( #6637 )
...
Remove deprecated 'pytest_itemstart' hook
2020-01-31 16:12:27 -03:00
4038d6c773
Merge pull request #6640 from bluetech/master-to-features
...
Merge master to features - one last time
2020-01-31 12:11:14 +02:00
a435faad5c
Merge branch 'master' into master-to-features
2020-01-31 11:27:06 +02:00
3645ba3072
Merge pull request #6638 from blueyed/rfEX
...
tests: use `-rfEX`
2020-01-31 01:06:32 +01:00
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
8301993e5e
tests: use `-rfEX`
...
`-fE` is the default in `features` now [1], but the idea is to add `X`
also to it in the long run, so let's dogfood it ourselves.
1: https://github.com/pytest-dev/pytest/pull/6524
2: https://github.com/pytest-dev/pytest/pull/6524#issuecomment-577650703
2020-01-31 00:18:51 +01:00
1dc265e34a
Merge pull request #6633 from blueyed/async_warn
...
python: factor out async_warn
2020-01-30 23:39:06 +01:00
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
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
5b81bd862c
minor: doc: getfuncargnames: move TODO out of docstring
2020-01-30 23:22:10 +01:00
2902c7263c
fixtures: move import of ParameterSet to top level
...
This gets typically used always (via `getfixtureinfo`).
2020-01-30 23:03:02 +01:00
442dccef65
python: factor out async_warn
2020-01-30 22:55:23 +01:00
e830432592
Merge pull request #6601 from blueyed/typing-pytest_collection
...
typing: pytest_collection
2020-01-30 20:47:06 +01:00
ae788997f2
Merge pull request #6630 from blueyed/revert-curl
...
Revert "ci: codecov: use `--retry-connrefused` with curl"
2020-01-30 20:46:46 +01:00
88b800355a
typing: pytest_collection
2020-01-30 19:58:43 +01:00
864338de71
Revert "ci: codecov: use `--retry-connrefused` with curl"
...
Not known with `curl` on Travis at least.
Reverts https://github.com/pytest-dev/pytest/pull/6573 .
This reverts commit df1f43ee28
2020-01-30 19:56:25 +01:00
eb5e651d7e
Fix typo ( #6629 )
...
Fix typo
2020-01-30 13:41:47 -03:00
55bffb7c15
Fix typo
2020-01-30 18:30:51 +02:00
be18f85a6e
Reword fixture docs for clarity ( #6627 )
...
Reword fixture docs for clarity
2020-01-30 12:56:45 -03:00
28b8f3ca3a
Merge pull request #6461 from blueyed/test-package-upstream
...
Package: typing, cleanup
2020-01-30 16:41:47 +01:00
d91459fc75
Reword fixture docs for clarity
2020-01-30 09:32:54 -04:00
4de8e680e3
Merge pull request #6625 from blueyed/merge-master-into-features
...
Merge master into features
2020-01-30 02:53:56 +01:00
ef283efc42
Merge pull request #6624 from nicoddemus/gh-notes-wrap
...
Use --wrap=preserve in release notes script
2020-01-29 22:36:42 -03:00
b5b6e051ed
Merge master into features
2020-01-30 02:29:02 +01:00
Daniel Hahler
Bruno Oliveira
rebecca-palmer
Ran Benita
Hugo van Kemenade
Daniel Arndt