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

2298 Commits

Author SHA1 Message Date
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