tests: qemudriver: restructure mocks

Since `qemu_version_mock` is required for all tests using `qemu_mock`,
move its functionality into `qemu_mock`.

Since `qemu_driver` will fixture will soon need `qemu_mock` always, add
it as its dependency now, thus minimizing the direct fixtures required
by the tests.

Signed-off-by: Bastian Krause <bst@pengutronix.de>

Author: Bastian-Krause

tests/test_qemudriver.py

@@ -27,7 +27,7 @@ def qemu_target(qemu_env):
     return qemu_env.get_target()
 
 @pytest.fixture
-def qemu_driver(qemu_target):
+def qemu_driver(qemu_target, qemu_mock):
     q = QEMUDriver(
         qemu_target,
         "qemu",
@@ -60,28 +60,26 @@ def qemu_mock(mocker):
     socket_mock = mocker.patch('socket.socket')
     socket_mock.return_value.accept.return_value = mocker.MagicMock(), ''
 
-@pytest.fixture
-def qemu_version_mock(mocker):
-    run_mock = mocker.patch('subprocess.run')
-    run_mock.return_value.returncode = 0
-    run_mock.return_value.stdout = "QEMU emulator version 4.2.1"
+    version_mock = mocker.patch('subprocess.run')
+    version_mock.return_value.returncode = 0
+    version_mock.return_value.stdout = "QEMU emulator version 4.2.1"
 
-def test_qemu_instance(qemu_target, qemu_driver):
+def test_qemu_instance(qemu_driver):
     assert (isinstance(qemu_driver, QEMUDriver))
 
-def test_qemu_activate_deactivate(qemu_target, qemu_driver, qemu_version_mock):
+def test_qemu_activate_deactivate(qemu_target, qemu_driver):
     qemu_target.activate(qemu_driver)
     qemu_target.deactivate(qemu_driver)
 
-def test_qemu_on_off(qemu_target, qemu_driver, qemu_mock, qemu_version_mock):
+def test_qemu_on_off(qemu_target, qemu_driver):
     qemu_target.activate(qemu_driver)
 
     qemu_driver.on()
     qemu_driver.off()
 
     qemu_target.deactivate(qemu_driver)
 
-def test_qemu_read_write(qemu_target, qemu_driver, qemu_mock, qemu_version_mock):
+def test_qemu_read_write(qemu_target, qemu_driver):
     qemu_target.activate(qemu_driver)
 
     qemu_driver.on()