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

11769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hahler
30922ee694 Merge master into features 2020-01-28 01:40:14 +01:00
Daniel Hahler
d0cb16010b Merge pull request #6580 from blueyed/typing-testdir-init 
typing: Testdir.__init__
 2020-01-28 00:58:11 +01:00
Daniel Hahler
ad0f4f0ac0 tests: cover collect_by_name with non-existing 2020-01-28 00:41:46 +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
Daniel Hahler
aa318e9adf Merge pull request #6587 from blueyed/mypy-show_error_codes 
mypy: show_error_codes=True
 2020-01-27 22:58:48 +01:00
Daniel Hahler
20b66e60c0 Merge pull request #6566 from blueyed/rm-encodedfile-writelines 
Fix `EncodedFile.writelines`
 2020-01-27 22:58:31 +01:00
Daniel Hahler
d017b69f38 mypy: show_error_codes=True 2020-01-27 22:18:35 +01:00
Zac Hatfield-Dodds
a9eab07739 Merge pull request #6576 from blueyed/test_via_exec 
tests: add test_via_exec
 2020-01-27 17:57:28 +11:00
Daniel Hahler
bf5c76359c fixup! typing: tests: tmpfile 2020-01-26 23:14:32 +01:00
Daniel Hahler
40758e86ca tests: add test_via_exec 
Via https://github.com/pytest-dev/pytest/issues/6574.
 2020-01-26 23:04:18 +01:00
Daniel Hahler
d678d380cb typing: tests: tmpfile 2020-01-25 19:21:19 +01:00
Daniel Hahler
3f8f395210 typing: EncodedFile 2020-01-25 19:20:48 +01:00
Daniel Hahler
7c52a37d46 Merge pull request #6572 from blueyed/fix-test_collection_collect_only_live_logging 
tests: test_collection_collect_only_live_logging: allow for 1+s
 2020-01-25 19:05:37 +01:00
Daniel Hahler
198b1dcffd Merge pull request #6573 from blueyed/codecov-curl-retry-connrefused 
ci: codecov: use `--retry-connrefused` with curl
 2020-01-25 19:05:13 +01:00
Daniel Hahler
df1f43ee28 ci: codecov: use --retry-connrefused with curl 
While it might not help with the following, it certainly might happen as
well.

```
+ curl -S -L --connect-timeout 5 --retry 6 -s https://codecov.io/bash -o codecov-upload.sh
curl: (16) Error in the HTTP2 framing layer
```
 2020-01-25 18:22:03 +01:00
Daniel Hahler
778d4364fa tests: test_collection_collect_only_live_logging: allow for 1s 
Might be slow on CI.

Ref: https://github.com/pytest-dev/pytest/pull/6570/checks?check_run_id=408752475#step:6:109
 2020-01-25 18:14:49 +01:00
Daniel Hahler
039d582b52 Fix EncodedFile.writelines 
This is implemented by the underlying stream already, which additionally
checks if the stream is not closed, and calls `write` per line.

Ref/via: https://github.com/pytest-dev/pytest/pull/6558#issuecomment-578210807
 2020-01-25 18:06:50 +01:00
Daniel Hahler
b687f20d25 Merge pull request #6375 from hugovk/rm-deprecated-license_file-metadata 
Remove deprecated license_file from setup.cfg
 2020-01-25 16:20:48 +01:00
Daniel Hahler
510be29db8 Merge pull request #6534 from blueyed/test_plugin_loading_order 
tests: add test_plugin_loading_order
 2020-01-25 16:20:06 +01:00
Hugo
fe343a79f8 Remove deprecated license_file from setup.cfg 
Starting with wheel 0.32.0 (2018-09-29), the `license_file` option is deprecated.

* https://wheel.readthedocs.io/en/stable/news.html

The wheel will continue to include `LICENSE`, it is now included automatically:

* https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file

And `LICENSE` is still included in sdists thanks to setuptools-scm:

* https://github.com/pytest-dev/pytest/pull/6348#issuecomment-567836331
 2020-01-25 17:08:00 +02:00
Daniel Hahler
2e8f7ef31b Merge pull request #6569 from blueyed/merge-master-into-features 
Merge master into features
 2020-01-25 14:40:24 +01:00
Daniel Hahler
c51173d426 Merge master into features 2020-01-25 14:18:02 +01:00
Daniel Hahler
2da331ea9c Merge pull request #6568 from bluetech/redundant-commas 
Remove a couple of redundant commas
 2020-01-25 14:17:01 +01:00
Ran Benita
94d8c071b6 Remove a couple of redundant commas 
Mypy complains about this once the function is typed:

src/_pytest/main.py:85: error: "_addoption" of "OptionGroup" does not return a value
src/_pytest/main.py:133: error: "addoption" of "OptionGroup" does not return a value
 2020-01-25 14:12:47 +01:00
Daniel Hahler
0d55fb3797 Merge pull request #6567 from blueyed/codecov-config 
ci: codecov: only use "comment: off"
 2020-01-25 14:00:32 +01:00
Ran Benita
a76bc64c54 Merge pull request #6547 from bluetech/session-initialparts 
Refactor Session._initialparts to have a more explicit type
 2020-01-25 14:30:26 +02:00
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
Daniel Hahler
a29d6194f5 ci: codecov: only use "comment: off" 
The changes status is quite buggy, remove it for now.
This just uses "comment: off" then.
 2020-01-25 11:14:00 +01:00
Daniel Hahler
6f2943c7b3 Merge pull request #6558 from gavento/patch-1 
Make EncodedFile.write() return the return value from inner write()
 2020-01-25 11:04:12 +01:00
Tomáš Gavenčiak
5e15c86cc6 Fix EncodedFile.write return value 
Make EncodedFile, used for captured output streams, method .write return
the number of characters written. Add test for captured stderr write.
Fixes #6557.

Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2020-01-25 10:36:23 +01:00
Daniel Hahler
498884a2a0 Merge pull request #6563 from blueyed/merge-master-into-features 
Merge master into features
 2020-01-25 00:31:58 +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
09ab5fd7e9 Merge pull request #6529 from blueyed/fix-test_repr_traceback_with_invalid_cwd 
tests: fix test_repr_traceback_with_invalid_cwd
 2020-01-24 23:41:31 +01:00
Daniel Hahler
040a61e22c Merge pull request #6550 from blueyed/doc-cleandir-cd-back 
doc/en/fixture.rst: chdir back to previous directory
 2020-01-24 23:41:08 +01:00
Daniel Hahler
2c32dad343 Merge pull request #6554 from blueyed/test_fixture_arg_ordering 
tests: add test_fixture_arg_ordering
 2020-01-24 23:40:58 +01:00
Daniel Hahler
8a8f9bd751 Merge pull request #6562 from blueyed/ci-rm-azure 
ci: remove Azure config/scripts
 2020-01-24 23:39:57 +01:00
Daniel Hahler
192d3adda3 tests: add test_fixture_arg_ordering 
This is a regression test for part of
https://github.com/pytest-dev/pytest/issues/6492, testing one of the
fixes in https://github.com/pytest-dev/pytest/pull/6551.
 2020-01-24 17:48:08 -03:00
Daniel Hahler
5865520c51 Merge pull request #6561 from blueyed/ci-gha-name-flag 
ci: GHA: codecov: set CODECOV_NAME, OS in flags
 2020-01-24 20:04:12 +01:00
Daniel Hahler
e2fa78c99f ci: remove Azure config/scripts 
This is covered by GitHub Actions now.
 2020-01-24 19:49:57 +01:00
Daniel Hahler
fe895a40b6 Merge pull request #6559 from blueyed/ci-travis-remove-linting 
ci: Travis: removing linting,docs,doctesting
 2020-01-24 19:45:42 +01:00
Daniel Hahler
934f38995a ci: GHA: codecov: set CODECOV_NAME, OS in flags 2020-01-24 19:42:51 +01:00
Daniel Hahler
5dcd24fecb Merge pull request #6553 from blueyed/ci-gha-use-report-coverage.sh 
ci: GHA: use scripts/report-coverage.sh
 2020-01-24 19:20:23 +01:00
Daniel Hahler
e5a362d0f5 ci: GHA: use scripts/report-coverage.sh 2020-01-24 18:00:38 +01:00
Daniel Hahler
f8654e6656 ci: Travis: removing linting,docs,doctesting 
This is handled by GHA already, and not affected/required for coverage.
 2020-01-24 17:26:10 +01:00
Daniel Hahler
0d4f479aa8 Merge pull request #6552 from blueyed/ci-linting 
ci: GHA: separate jobs for linting, docs, doctesting
 2020-01-24 13:36:59 +01:00
Daniel Hahler
79d00ab35a Merge pull request #6549 from blueyed/fix-release-minor 
doc: minor fixes for the release process
 2020-01-24 13:36:48 +01:00
Daniel Hahler
79ae86cc3f tests: fix test_repr_traceback_with_invalid_cwd 
This never worked as expected (since a912d3745), and only py38-windows
triggered the mocked `os.getcwd` unintentionally, via `inspect`.
 2020-01-24 12:52:12 +01:00
Daniel Hahler
c051a9e7b9 ci: GHA: separate jobs for linting, docs, doctesting 
It helps to know upfront that e.g. linting failed, and makes finding the
error easier.
 2020-01-24 12:29:35 +01:00