Skip to content

Merge master into features #6539

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.

Sign up for GitHub

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 5 commits into from
Jan 22, 2020
Merged

Merge master into features #6539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8787b8
tests: fix test_cwd_snapshot
blueyed Jan 22, 2020
d878d9d
tests: use NotImplementedError with uncovered code
blueyed Jan 22, 2020
ba49581
Merge pull request #6538 from blueyed/test-coverage
blueyed Jan 22, 2020
85df6bb
Merge pull request #6536 from blueyed/fix-test_cwd_snapshot
blueyed Jan 22, 2020
aca1723
Merge master into features
blueyed Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/_pytest/pytester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,8 @@ class Testdir:

"""

__test__ = False

CLOSE_STDIN = object

class TimeoutExpired(Exception):
Expand Down
4 changes: 3 additions & 1 deletion testing/test_pytester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from _pytest.pytester import LineMatcher
from _pytest.pytester import SysModulesSnapshot
from _pytest.pytester import SysPathsSnapshot
from _pytest.pytester import Testdir


def test_make_hook_recorder(testdir) -> None:
Expand Down Expand Up @@ -273,7 +274,8 @@ def test_assert_outcomes_after_pytest_error(testdir) -> None:
result.assert_outcomes(passed=0)


def test_cwd_snapshot(tmpdir) -> None:
def test_cwd_snapshot(testdir: Testdir) -> None:
tmpdir = testdir.tmpdir
foo = tmpdir.ensure("foo", dir=1)
bar = tmpdir.ensure("bar", dir=1)
foo.chdir()
Expand Down
14 changes: 8 additions & 6 deletions testing/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def test_outcomeexception_passes_except_Exception() -> None:
try:
raise outcomes.OutcomeException("test")
except Exception:
pass
raise NotImplementedError()


def test_pytest_exit() -> None:
Expand Down Expand Up @@ -740,8 +740,9 @@ def f():
mod2 = pytest.importorskip("hello123", minversion="1.3")
assert mod2 == mod
except Skipped:
print(_pytest._code.ExceptionInfo.from_current())
pytest.fail("spurious skip")
raise NotImplementedError(
"spurious skip: {}".format(_pytest._code.ExceptionInfo.from_current())
)


def test_importorskip_imports_last_module_part() -> None:
Expand All @@ -759,8 +760,9 @@ def test_importorskip_dev_module(monkeypatch) -> None:
with pytest.raises(Skipped):
pytest.importorskip("mockmodule1", minversion="0.14.0")
except Skipped:
print(_pytest._code.ExceptionInfo.from_current())
pytest.fail("spurious skip")
raise NotImplementedError(
"spurious skip: {}".format(_pytest._code.ExceptionInfo.from_current())
)


def test_importorskip_module_level(testdir) -> None:
Expand Down Expand Up @@ -1030,7 +1032,7 @@ def test_outcome_exception_bad_msg() -> None:
"""Check that OutcomeExceptions validate their input to prevent confusing errors (#5578)"""

def func() -> None:
pass
raise NotImplementedError()

expected = (
"OutcomeException expected string as 'msg' parameter, got 'function' instead.\n"
Expand Down