floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,849 Commits 32 Branches 205 Tags
8c53dbf9d746292a36160d290c77a350533cbdba
Commit Graph

238 Commits

Author SHA1 Message Date
Ran Benita
fcc473ab1c Use dict instead of OrderedDict on Python 3.7 
OrderedDict is quite a bit heavier than just a dict.
 2020-05-06 11:58:28 +03:00
Ran Benita
69143fe5b0 code: fix import cycles between code.py and source.py 
These two files were really intertwined. Make it so code.py depends on
source.py without a reverse dependency.

No functional changes.
 2020-05-06 11:01:32 +03:00
Ran Benita
907e29a47b fixtures: deprecate pytest._fillfuncargs function 
This function is exposed and kept alive for the oejskit plugin which is
abandoned and no longer works with recent plugins, so let's prepare to
completely remove it.
 2020-04-24 18:54:46 +03:00
Simon K
de6c28ed1f Improve error handling around yieldctx fixtures which do not yield a value (#7083) 2020-04-15 12:17:13 +03:00
Ronny Pfannschmidt
19c243f0fa Merge pull request #6285 from earonesty/patch-1 
Add _pytest.fixtures.FixtureLookupError to top level import
 2020-04-10 07:58:58 +02:00
Ran Benita
4a324ce920 Remove unused defaultfuncargprefixmarker 
Unused since 1e80a9cb34.
 2020-04-04 14:34:40 +03:00
Ran Benita
03451c397f Simplify positional arguments compatibility code in pytest.fixture() 
The dynamic scope feature added in 10bf6aac76
necessitated some wrangling of arguments in pytest.fixture(). In
particular, it deprecated positional arguments in favor of keyword-only
arguments, while keeping backward compatibility.

The way it did this avoided some code duplication but ended up being
quite hard to follow and to annotate with types.

Replace it with some straightforward code, which is not very DRY but is
simple and easy to remove when the time comes.
 2020-04-02 14:52:58 +03:00
Ran Benita
a785754523 Change EnvironmentError, IOError to OSError - they are aliases 
Since Python 3.3, these are aliases for OSError:
https://docs.python.org/3/whatsnew/3.3.html#pep-3151-reworking-the-os-and-io-exception-hierarchy
 2020-03-27 18:40:23 +03:00
Bruno Oliveira
010e711971 Merge pull request #6914 from nicoddemus/revert-6330 
Revert "[parametrize] enforce explicit argnames declaration (#6330)"
 2020-03-13 10:49:48 -03:00
Ran Benita
4f8fff9cab Merge pull request #6868 from bluetech/simplify-exc 
Simplify some exception handling code
 2020-03-10 20:32:08 +02:00
Daniel Hahler
dc86fb6758 pre-commit run --all-files 2020-03-07 23:47:55 +01: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
Bruno Oliveira
aac11e5e75 Mention FixtureLookupError in getfixturevalue docs 2020-03-03 10:05:19 -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
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
3e4e6297ce Remove unused field FixtureManager._arg2finish 
Not used since 4f0879ff9b.
 2020-02-10 17:30:20 +02:00
Vladyslav Rachek
9e262038c8 [parametrize] enforce explicit argnames declaration (#6330) 
Every argname used in `parametrize` either must
be declared explicitly in the python test function, or via
`indirect` list

Fix #5712
 2020-02-06 20:20:25 -03: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
Ran Benita
a435faad5c Merge branch 'master' into master-to-features 2020-01-31 11:27:06 +02: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
55e5817570 Merge master into features 2020-01-29 03:07:35 +01:00
Bruno Oliveira
d282424589 Fix unguarded == comparison in fixtures. (#6541) 
Fix unguarded `==` comparison in fixtures.
 2020-01-28 20:54:14 -03:00
Holger Kohr
80d4dd6f0b Replace == with is for comparison of cache keys 
Closes #6497
 2020-01-28 18:05:53 -03: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
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
03bc8aba4e config: typing for create_terminal_writer, re-export TerminalWriter 
This also imports `TerminalWriter` explicitly via `_pytest._io`,
allowing for easier extending / replacing it.
 2020-01-23 14:09:37 +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
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
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
Bruno Oliveira
cdaa9c06e1 Revert "fixtures register finalizers with all fixtures before t… (#6496) 
Revert "fixtures register finalizers with all fixtures before them in the stack"
 2020-01-20 13:49:00 -03:00
Ran Benita
930a158a6a Fix type errors after adding types to the py dependency 2020-01-19 14:48:24 +02:00
Daniel Hahler
5c445b05e7 typing: py.io.TerminalWriter for tw arguments 2020-01-19 11:21:16 +01:00
Bruno Oliveira
cc7f294cfe Revert "fixtures register finalizers with all fixtures before them in the stack" 
This reverts commit 99180939fe.
 2020-01-17 12:55:57 -03:00
Daniel Hahler
4a42deee7e typing: Node.reportinfo: might return py.path.local via fspath 2020-01-17 11:05:46 +01:00
Daniel Hahler
83813bf515 Merge master into features 
Conflicts:
	.github/workflows/main.yml
 2020-01-16 19:45:52 +01:00
Daniel Hahler
4630e2725e Use TYPE_CHECKING instead of False 
This allows for e.g. Jedi to infer types (it checks the name).

It was only used to support Python 3.5.0/3.5.1, where this is is not
available in the `typing` module.

Ref: https://github.com/davidhalter/jedi/issues/1472

Uses `TYPE_CHECKING = False` in `_pytest.outcomes` to avoid having to
work around circular import.
 2020-01-16 16:11:39 +01:00
Chris NeJame
99180939fe fixtures register finalizers with all fixtures before them in the stack 2020-01-15 11:00:42 -05:00
Daniel Hahler
bc7282576f typing: minor improvements 2019-11-24 23:20:03 +01:00
Ran Benita
e3ac44df36 Inline the FuncargnamesCompatAttr compat helper 
It doesn't help much IMO, just adds indirection and makes it harder to
type.
 2019-11-16 17:22:09 +02:00
Daniel Hahler
741f0fedd1 typing around Node.location, reportinfo, repr_excinfo etc 2019-11-05 16:22:58 +01: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
Victor Maryama
122cf60b27 Always creating list for consistency. 
Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2019-10-12 15:46:28 +02:00
Victor Maryama
1f639e2c22 Casting fixture parameter to list at the beginning of parameter parsing. 2019-10-12 14:33:43 +02:00
Bruno Oliveira
6918d07560 Merge remote-tracking branch 'upstream/features' into aklajnert/1682-dynamic-scope 2019-09-18 07:44:18 -03:00
Andrzej Klajnert
f2f3ced508 Fixed the fixture function signature. 2019-09-10 16:20:44 +02:00
aklajnert
10bf6aac76 Implemented the dynamic scope feature. 2019-08-31 18:12:24 +02:00
Bruno Oliveira
bd57307a39 Merge pull request #5768 from robholt/fixture-class-instance 
Fix self reference in function scoped fixtures
 2019-08-30 12:31:16 -03:00
Bruno Oliveira
3ddbc7fb2a Improve CHANGELOG and add some comments 
Ref: #5768
 2019-08-30 11:20:19 -03:00
Andrzej Klajnert
487659d8b1 Fix the scope behavior with indirect fixtures. 2019-08-29 07:23:08 +02:00