floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,313 Commits 32 Branches 205 Tags
f0f552d60ccfaa5b96ca3287fef97ed944791c07
Commit Graph

12313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bruno Oliveira
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
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
abffd16ce6 Keep (revisited) comment from https://github.com/pytest-dev/pytest/commit/4d31ea831 2020-02-03 14:04:16 +01:00
Daniel Hahler
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
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
rebecca-palmer
c55bf23cbe doc: s/pytest_mark/pytestmark (#6661) 2020-02-03 08:56:37 +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
09a0e45492 testing/test_pytester.py: cosmetics 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
Hugo van Kemenade
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
Bruno Oliveira
39b25ddcf3 Remove deprecated 'pytest_itemstart' hook (#6637) 
Remove deprecated 'pytest_itemstart' hook
 2020-01-31 16:12:27 -03:00
Ran Benita
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
Ran Benita
a435faad5c Merge branch 'master' into master-to-features 2020-01-31 11:27:06 +02:00
Daniel Hahler
3645ba3072 Merge pull request #6638 from blueyed/rfEX 
tests: use `-rfEX`
 2020-01-31 01:06:32 +01: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
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
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
e830432592 Merge pull request #6601 from blueyed/typing-pytest_collection 
typing: pytest_collection
 2020-01-30 20:47:06 +01:00
Daniel Hahler
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
Daniel Hahler
88b800355a typing: pytest_collection 2020-01-30 19:58:43 +01:00
Daniel Hahler
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
Bruno Oliveira
eb5e651d7e Fix typo (#6629) 
Fix typo
 2020-01-30 13:41:47 -03:00
Hugo van Kemenade
55bffb7c15 Fix typo 2020-01-30 18:30:51 +02:00
Bruno Oliveira
be18f85a6e Reword fixture docs for clarity (#6627) 
Reword fixture docs for clarity
 2020-01-30 12:56:45 -03:00
Daniel Hahler
28b8f3ca3a Merge pull request #6461 from blueyed/test-package-upstream 
Package: typing, cleanup
 2020-01-30 16:41:47 +01:00
Daniel Arndt
d91459fc75 Reword fixture docs for clarity 2020-01-30 09:32:54 -04:00
Daniel Hahler
4de8e680e3 Merge pull request #6625 from blueyed/merge-master-into-features 
Merge master into features
 2020-01-30 02:53:56 +01:00
Bruno Oliveira
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
Daniel Hahler
b5b6e051ed Merge master into features 2020-01-30 02:29:02 +01:00
Daniel Hahler
10b1b79f4e Merge pull request #6623 from blueyed/move-back-test_getfslineno 
tests: move test_getfslineno back
 2020-01-30 02:17:25 +01:00
Bruno Oliveira
6d7e06e6be Use --wrap=preserve in release notes script 
Follow up to #6621 after premature merge
 2020-01-29 20:28:04 -03:00
Daniel Hahler
78eddcb5b1 tests: move test_getfslineno back 
Reverts https://github.com/pytest-dev/pytest/pull/6610.

The tested `getfslineno` is `src/_pytest/_code/source.py` actually,
exported via `src/_pytest/_code/__init__.py`.
I've confused it with the one in `src/_pytest/compat.py` apparently.
 2020-01-29 23:47:39 +01:00
Bruno Oliveira
757873edb3 Docs: Don't wrap the markdown for GitHub releases (#6621) 
Docs: Don't wrap the markdown for GitHub releases
 2020-01-29 19:38:17 -03: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
Daniel Hahler
66330444a3 Merge pull request #6611 from blueyed/test_code-imports 
tests: test_code: improve/clarify imports
 2020-01-29 21:23:37 +01:00
Hugo van Kemenade
97f1645993 Don't wrap the markdown for GitHub releases 2020-01-29 21:56:01 +02:00