From f55242ad93c9927a50611b666aa9bcdb1b0bafad Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 19 Apr 2015 17:13:47 -0300 Subject: [PATCH] Use pytest-mock to install QApplication.clipboard mock --- tests/misc/test_miscwidgets.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/misc/test_miscwidgets.py b/tests/misc/test_miscwidgets.py index ad94f2613..1bd19541a 100644 --- a/tests/misc/test_miscwidgets.py +++ b/tests/misc/test_miscwidgets.py @@ -48,17 +48,17 @@ class TestCommandLineEdit: objreg.delete('command-history') - @pytest.yield_fixture - def mock_clipboard(self): + @pytest.fixture + def mock_clipboard(self, mocker): """ Fixture installs a MagicMock into QApplication.clipboard() and returns it. """ - with mock.patch.object(QApplication, 'clipboard'): - clipboard = mock.MagicMock() - clipboard.supportsSelection.return_value = True - QApplication.clipboard.return_value = clipboard - yield clipboard + mocker.patch.object(QApplication, 'clipboard') + clipboard = mock.MagicMock() + clipboard.supportsSelection.return_value = True + QApplication.clipboard.return_value = clipboard + return clipboard def test_position(self, qtbot, cmd_edit): """Test cursor position based on the prompt."""