diff options
Diffstat (limited to 'tests/end2end/fixtures/testprocess.py')
| -rw-r--r-- | tests/end2end/fixtures/testprocess.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py index 78c08a4c0..822d57b7a 100644 --- a/tests/end2end/fixtures/testprocess.py +++ b/tests/end2end/fixtures/testprocess.py @@ -26,13 +26,12 @@ import dataclasses import pytest import pytestqt.wait_signal -from qutebrowser.qt.core import (pyqtSlot, pyqtSignal, QProcess, QObject, - QElapsedTimer, QProcessEnvironment) -from qutebrowser.qt.test import QSignalSpy +from qutebrowser.qt import test from helpers import testutils from qutebrowser.utils import utils as quteutils +from qutebrowser.qt import core class InvalidLine(Exception): @@ -120,7 +119,7 @@ def pytest_runtest_makereport(item, call): f"{name} output", _render_log(content, verbose=verbose)) -class Process(QObject): +class Process(core.QObject): """Abstraction over a running test subprocess process. @@ -139,8 +138,8 @@ class Process(QObject): new_data: Emitted when a new line was parsed. """ - ready = pyqtSignal() - new_data = pyqtSignal(object) + ready = core.pyqtSignal() + new_data = core.pyqtSignal(object) KEYS = ['data'] def __init__(self, request, parent=None): @@ -150,8 +149,8 @@ class Process(QObject): self._started = False self._invalid = [] self._data = [] - self.proc = QProcess() - self.proc.setReadChannel(QProcess.ProcessChannel.StandardError) + self.proc = core.QProcess() + self.proc.setReadChannel(core.QProcess.ProcessChannel.StandardError) self.exit_expected = None # Not started at all yet def _log(self, line): @@ -202,7 +201,7 @@ class Process(QObject): blocker.connect(signal) return blocker - @pyqtSlot() + @core.pyqtSlot() def read_log(self): """Read the log from the process' stdout.""" if not hasattr(self, 'proc'): @@ -259,7 +258,7 @@ class Process(QObject): if args is None: args = self._default_args() - procenv = QProcessEnvironment.systemEnvironment() + procenv = core.QProcessEnvironment.systemEnvironment() if env is not None: for k, v in env.items(): procenv.insert(k, v) @@ -325,7 +324,7 @@ class Process(QObject): def is_running(self): """Check if the process is currently running.""" - return self.proc.state() == QProcess.ProcessState.Running + return self.proc.state() == core.QProcess.ProcessState.Running def _match_data(self, value, expected): """Helper for wait_for to match a given value. @@ -394,8 +393,8 @@ class Process(QObject): elided = quteutils.elide(repr(message), 100) self._log("\n----> Waiting for {} in the log".format(elided)) - spy = QSignalSpy(self.new_data) - elapsed_timer = QElapsedTimer() + spy = test.QSignalSpy(self.new_data) + elapsed_timer = core.QElapsedTimer() elapsed_timer.start() while True: |