Merge pull request #143 from ikonst/no_terminal

Support terminal plugin being disabled

CHANGELOG.rst

@@ -1,3 +1,8 @@
+1.10.4
+------
+
+* Fix plugin when 'terminal' plugin is disabled
+
 1.10.3
 ------
 

pytest_mock.py

@@ -328,7 +328,7 @@ def parse_ini_boolean(value):
 
 
 def pytest_configure(config):
-    tb = config.getoption("--tb")
+    tb = config.getoption("--tb", default="auto")
     if (
         parse_ini_boolean(config.getini("mock_traceback_monkeypatch"))
         and tb != "native"

test_pytest_mock.py

@@ -561,6 +561,22 @@ def test_foo(mocker):
     )  # make sure there are no duplicated tracebacks (#44)
 
 
+def test_monkeypatch_no_terminal(testdir):
+    """Don't crash without 'terminal' plugin.
+    """
+    testdir.makepyfile(
+        """
+        def test_foo(mocker):
+            stub = mocker.stub()
+            stub(1, greet='hello')
+            stub.assert_called_once_with(1, greet='hey')
+        """
+    )
+    result = runpytest_subprocess(testdir, "-p", "no:terminal", "-s")
+    assert result.ret == 1
+    assert result.stdout.lines == []
+
+
 @pytest.mark.skipif(sys.version_info[0] < 3, reason="Py3 only")
 def test_standalone_mock(testdir):
     """Check that the "mock_use_standalone" is being used.