Skip to content
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

Remove obsolete "importorskip('unittest.mock')" calls #5608

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Remove obsolete "importorskip('unittest.mock')" calls #5608

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a3f409
Remove obsolete "importorskip('unittest.mock')" calls
nicoddemus Jul 15, 2019
65c2301
Update test_getfuncargnames_patching to work with modern mock
nicoddemus Jul 15, 2019
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
3 changes: 0 additions & 3 deletions testing/python/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ def f(x, y, z):
assert values == ("y", "z")

def test_unittest_mock(self, testdir):
pytest.importorskip("unittest.mock")
testdir.makepyfile(
"""
import unittest.mock
Expand All @@ -142,7 +141,6 @@ def test_hello(self, abspath):
reprec.assertoutcome(passed=1)

def test_unittest_mock_and_fixture(self, testdir):
pytest.importorskip("unittest.mock")
testdir.makepyfile(
"""
import os.path
Expand All @@ -164,7 +162,6 @@ def test_hello(inject_me):
reprec.assertoutcome(passed=1)

def test_unittest_mock_and_pypi_mock(self, testdir):
pytest.importorskip("unittest.mock")
pytest.importorskip("mock", "1.0.1")
nicoddemus marked this conversation as resolved.
Show resolved Hide resolved
testdir.makepyfile(
"""
Expand Down