floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,695 Commits 32 Branches 205 Tags
dd5c2b22bd3534ee02039932a51fc7a9eba01ca0
Commit Graph

11695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Daniel Hahler
72d06e6dec Merge pull request #6539 from blueyed/merge-master-into-features 
Merge master into features
 2020-01-22 19:32:49 +01:00
Daniel Hahler
aca1723d45 Merge master into features 2020-01-22 19:18:13 +01:00
Daniel Hahler
85df6bbe26 Merge pull request #6536 from blueyed/fix-test_cwd_snapshot 
tests: fix test_cwd_snapshot
 2020-01-22 16:46:04 +01:00
Daniel Hahler
ba49581510 Merge pull request #6538 from blueyed/test-coverage 
tests: use NotImplementedError with uncovered code
 2020-01-22 16:45:20 +01:00
Bruno Oliveira
0bf9628e62 Merge master into features (#6537) 
Merge master into features
 2020-01-22 12:43:19 -03:00
Daniel Hahler
d878d9d4d5 tests: use NotImplementedError with uncovered code 2020-01-22 15:38:12 +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
Daniel Hahler
8c4dfca0c1 Merge pull request #6535 from blueyed/tox-doctesting 
tox: move doctesting into main testenv
 2020-01-22 14:38:34 +01:00
Daniel Hahler
b8787b8732 tests: fix test_cwd_snapshot 
Without restoring the cwd, successive tests might fail to parse the
config (via `_pytest.config._prepareconfig()`, for when `--lsof` is
used).

And it is good practice to restore the cwd in any case anyway.
 2020-01-22 14:34:11 +01:00
Daniel Hahler
ef294fc727 tox: move doctesting into main testenv 
This allows for `tox -e doctesting-coverage`, which would otherwise not
use the "doctesting" testenv.
 2020-01-22 13:32:30 +01:00
Daniel Hahler
0f78ef8e02 Merge pull request #6532 from blueyed/harden-test 
--cache-clear: add test for keeping non-supporting files
 2020-01-22 12:20:24 +01:00
Daniel Hahler
1cd4bafda7 Merge pull request #6531 from blueyed/ci-gha-success 
ci: GHA: remove unnecessary check for `success()`
 2020-01-21 22:38:50 +01:00
Daniel Hahler
8f5fd537d8 --cache-clear: add test for keeping non-supporting files 
Ref: https://github.com/pytest-dev/pytest/pull/6296
 2020-01-21 22:16:56 +01:00
Daniel Hahler
9869a3d9e1 ci: GHA: remove unnecessary check for success() 
Following jobs get aborted on failure.

Ref: https://github.com/pytest-dev/pytest/pull/6530
 2020-01-21 21:44:49 +01:00
Daniel Hahler
2f00b041e4 Merge pull request #6526 from blueyed/typing-code-path 
doc: fix Code.path: might return str
 2020-01-21 21:06:26 +01:00
Daniel Hahler
7ee27fedee doc: fix Code.path: might return str 2020-01-21 19:46:43 +01: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
a52f791461 Merge pull request #6518 from bluetech/fix-py-typed-fixes-regression 
Fix internal assert failure regression in 5.3.4
 2020-01-21 00:01:07 +02: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
ddfa41b5a7 Preparing release version 5.3.4 (#6516) 
Preparing release version 5.3.4
 2020-01-20 14:26:52 -03:00
Bruno Oliveira
6a26ac4125 Preparing release version 5.3.4 5.3.4 2020-01-20 13:53:31 -03: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
Bruno Oliveira
0dc82e8501 Add CHANGELOG entry for #6496 2020-01-20 13:32:27 -03:00
Daniel Hahler
f9bed82c4d Merge pull request #6515 from blueyed/tox-mypy-diff 
tox: add mypy-diff testenv
 2020-01-20 14:29:15 +01:00
Daniel Hahler
2406076611 tox: add mypy-diff testenv 2020-01-20 13:42:07 +01:00
Ran Benita
44eb1f580c Merge pull request #6311 from bluetech/type-annotations-10 
Some type annotation & check_untyped_defs fixes
 2020-01-19 20:17:32 +02:00
Ran Benita
3392be37e1 Fix check_untyped_defs in test_runner 2020-01-19 20:01:07 +02:00
Ran Benita
3d2680b31b Fix type of pytest.warns, and fix check_untyped_defs in test_recwarn 
The expected_warning is optional.
 2020-01-19 19:39:14 +02:00
Ran Benita
0b603156b9 Fix check_untyped_defs errors in test_pytester 2020-01-19 19:39:14 +02:00
Ran Benita
0c247be769 Add a few missing type annotations in _pytest._code 
These are more "dirty" than the previous batch (that's why they were
left out). The trouble is that `compile` can return either a code object
or an AST depending on a flag, so we need to add an overload to make the
common case Union free. But it's still worthwhile.
 2020-01-19 19:39:14 +02:00
Ran Benita
3e6f0f34ff Cleanup unhelpful alias _AST_FLAG 
Also replace one direct call to `compile` with this flag with the
equivalent wrapper `ast.parse`. This function can have a more precise
type.
 2020-01-19 19:19:34 +02:00
Ran Benita
4fb9cc3bf0 Merge pull request #6511 from bluetech/py-typed-fixes 
Fix type errors after adding types to the `py` dependency
 2020-01-19 15:23:14 +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
d347a30656 Merge pull request #6510 from blueyed/typing-fixes 
typing: fix some "incompatible types in assignment" with py
 2020-01-19 13:01:35 +01:00
Daniel Hahler
32b62f770f Merge pull request #6509 from blueyed/typing-minor 
typing: minor improvements
 2020-01-19 11:33:41 +01:00
Daniel Hahler
aaae43e0ba typing: fix some "incompatible types in assignment" with py 2020-01-19 11:32:45 +01:00
Daniel Hahler
1a75a3c08e Merge pull request #6482 from blueyed/fix-_TracebackStyle 
typing: fix _TracebackStyle
 2020-01-19 11:24:05 +01:00
Daniel Hahler
09e9a01df3 typing: fix _TracebackStyle: add "line" 2020-01-19 11:22:47 +01:00
Daniel Hahler
4b974b051d Merge pull request #6507 from blueyed/fix-test_excinfo 
tests: test_excinfo: remove unused pytest_version_info
 2020-01-19 11:21:46 +01:00
Daniel Hahler
5c445b05e7 typing: py.io.TerminalWriter for tw arguments 2020-01-19 11:21:16 +01:00
Daniel Hahler
4e0dbe92dd Node.name: str 2020-01-19 11:21:16 +01:00
Daniel Hahler
956389fa8c Session._fixturemanager 2020-01-19 11:21:16 +01:00
Daniel Hahler
61f985f3c7 tests: test_excinfo: remove unused pytest_version_info 
This might fail unnecessarily with a (wrong) determined version of e.g.
"4.7.dev307+ge98176cf5" (no patch version).
Ref: https://github.com/pytest-dev/pytest/pull/6506
 2020-01-19 08:11:13 +01:00
Daniel Hahler
2f0d0fb349 Merge pull request #6503 from blueyed/ci-travis-features 
[features] ci: Travis: drop deploy and non-coverage jobs
 2020-01-18 22:22:21 +01:00
Daniel Hahler
e98176cf50 Merge pull request #6501 from blueyed/test_color_yes 
tests: terminal: harden test_color_yes
 2020-01-18 16:11:27 +01:00
Daniel Hahler
38fc208205 tests: terminal: harden/improve test_color_yes 2020-01-18 15:49:59 +01:00
Daniel Hahler
89f92a459a ci: Travis: remove non-coverage jobs 
This helps with regard to slowness until
https://github.com/pytest-dev/pytest/pull/6470 is resolved.

(cherry picked from commit a7292a0544)
 2020-01-18 15:12:44 +01:00
Bruno Oliveira
40d0031cce Drop deploy from Travis in favor of GitHub actions 
GitHub actions already should deploy.

This is a stop gap while we figure out why coverage dropped
when removing Travis builds in #6470

(cherry picked from commit d1d7e5d41b)
 2020-01-18 15:12:44 +01:00