Skip to content

Merge master into features #6563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
Jan 24, 2020

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Jan 24, 2020

No description provided.

blueyed and others added 30 commits January 21, 2020 19:48
This should probably get transferred into a `pytest.fail` really, but
tests/documents the current behavior.
…ency""

Without changes to test_itemreport_reportinfo.

This reverts commit fb99b5c.

Conflicts:
	testing/test_nose.py
`-rv` is not a recognized reportchar.  Probably `-v` was meant, but is
not necessary to check that there are no warnings.

Followup to 2018cf1 (pytest-dev#3360).
Warnings are enabled by default, which is tested by `test_getreportopt`.
tests: remove unnecessary `-rw` option
It is not included with docs, and
`example/costlysetup/sub_a/test_quick.py::test_quick` sleeps for 5s,
slowing down `doctesting` unnecessarily.
typing: fix/adjust _code.source.getfslineno
This also imports `TerminalWriter` explicitly via `_pytest._io`,
allowing for easier extending / replacing it.
This would help with debugging missing coverage when removing Travis
jobs.
config: typing for create_terminal_writer, re-export TerminalWriter
This is considered to be best practice, and should be used in docs
therefore.
It helps to know upfront that e.g. linting failed, and makes finding the
error easier.
This never worked as expected (since a912d37), and only py38-windows
triggered the mocked `os.getcwd` unintentionally, via `inspect`.
doc: minor fixes for the release process
ci: GHA: separate jobs for linting, docs, doctesting
This is handled by GHA already, and not affected/required for coverage.
…erage.sh

ci: GHA: use scripts/report-coverage.sh
ci: Travis: removing linting,docs,doctesting
This is covered by GitHub Actions now.
ci: GHA: codecov: set CODECOV_NAME, OS in flags
This is a regression test for part of
pytest-dev#6492, testing one of the
fixes in pytest-dev#6551.
…ring

tests: add test_fixture_arg_ordering
doc/en/fixture.rst: chdir back to previous directory
…ck_with_invalid_cwd

tests: fix test_repr_traceback_with_invalid_cwd
Conflicts:
	src/_pytest/_code/code.py
	src/_pytest/main.py
@blueyed blueyed merged commit 498884a into pytest-dev:features Jan 24, 2020
@blueyed blueyed deleted the merge-master-into-features branch January 24, 2020 23:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants