Merge pull request #277 from nicoddemus/improve-standalone-mock-test

Author: nicoddemus

tests/test_pytest_mock.py

@@ -708,10 +708,14 @@ def test_foo(mocker):
 
 def test_standalone_mock(testdir: Any) -> None:
     """Check that the "mock_use_standalone" is being used."""
+    pytest.importorskip("mock")
+
     testdir.makepyfile(
         """
+        import mock
+
         def test_foo(mocker):
-            pass
+            assert mock.MagicMock is mocker.MagicMock
     """
     )
     testdir.makeini(
@@ -721,8 +725,7 @@ def test_foo(mocker):
     """
     )
     result = testdir.runpytest_subprocess()
-    assert result.ret == 3
-    result.stderr.fnmatch_lines(["*No module named 'mock'*"])
+    assert result.ret == 0
 
 
 @pytest.mark.usefixtures("needs_assert_rewrite")

tox.ini

@@ -6,6 +6,7 @@ envlist = py{37,38,39,310}, norewrite
 passenv = USER USERNAME
 deps =
     coverage
+    mock
     pytest-asyncio
 commands =
     coverage run --append --source={envsitepackagesdir}/pytest_mock -m pytest tests