floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Remove obsolete "importorskip('unittest.mock')" calls
This commit is contained in:
Bruno Oliveira 2019-07-16 04:41:58 -03:00 committed by GitHub
parent 54e08b729f 65c23017c7
commit 15e235c63e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testing/python/integration.py
View File

@ -104,21 +104,15 @@ class TestMockDecoration:
values = getfuncargnames(f) values = getfuncargnames(f)
assert values == ("x",) assert values == ("x",)
@pytest.mark.xfail( def test_getfuncargnames_patching(self):
strict=False, reason="getfuncargnames breaks if mock is imported"
)
def test_wrapped_getfuncargnames_patching(self):
from _pytest.compat import getfuncargnames from _pytest.compat import getfuncargnames
from unittest.mock import patch
def wrap(f): class T:
def func(): def original(self, x, y, z):
pass pass
func.__wrapped__ = f @patch.object(T, "original")
func.patchings = ["qwe"]
return func
@wrap
def f(x, y, z): def f(x, y, z):
pass pass
@ -126,7 +120,6 @@ class TestMockDecoration:
assert values == ("y", "z") assert values == ("y", "z")
def test_unittest_mock(self, testdir): def test_unittest_mock(self, testdir):
pytest.importorskip("unittest.mock")
testdir.makepyfile( testdir.makepyfile(
""" """
import unittest.mock import unittest.mock
@ -142,7 +135,6 @@ class TestMockDecoration:
reprec.assertoutcome(passed=1) reprec.assertoutcome(passed=1)
def test_unittest_mock_and_fixture(self, testdir): def test_unittest_mock_and_fixture(self, testdir):
pytest.importorskip("unittest.mock")
testdir.makepyfile( testdir.makepyfile(
""" """
import os.path import os.path
@ -164,7 +156,6 @@ class TestMockDecoration:
reprec.assertoutcome(passed=1) reprec.assertoutcome(passed=1)
def test_unittest_mock_and_pypi_mock(self, testdir): def test_unittest_mock_and_pypi_mock(self, testdir):
pytest.importorskip("unittest.mock")
pytest.importorskip("mock", "1.0.1") pytest.importorskip("mock", "1.0.1")
testdir.makepyfile( testdir.makepyfile(
""" """