summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2024-05-07 13:07:13 +0200
committerFlorian Bruhin <me@the-compiler.org>2024-05-07 13:29:44 +0200
commit31ab3431f1ffa7146a0c428c96434fb902951c9e (patch)
treeb17bbab808c20e2f2dbf9d0523a2efb714e0fffa
parent01cc3dfc30dbdad081dfe8fd08d592a885574ee1 (diff)
downloadqutebrowser-31ab3431f1ffa7146a0c428c96434fb902951c9e.tar.gz
qutebrowser-31ab3431f1ffa7146a0c428c96434fb902951c9e.zip
check more timers
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py2
-rw-r--r--qutebrowser/completion/completer.py4
-rw-r--r--qutebrowser/mainwindow/messageview.py2
-rw-r--r--qutebrowser/mainwindow/statusbar/clock.py3
-rw-r--r--qutebrowser/mainwindow/tabwidget.py2
-rw-r--r--qutebrowser/misc/httpclient.py4
-rw-r--r--qutebrowser/utils/usertypes.py4
8 files changed, 13 insertions, 12 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04b88d22f..1fa06dcb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,12 +23,12 @@ jobs:
- testenv: py312-pyqt67
os: ubuntu-22.04
python: "3.12"
- args: -x -s "tests/end2end/features/"
+ args: "tests/end2end/features/"
### Windows
- testenv: py312-pyqt67
os: windows-2019
python: "3.12"
- args: -x -s "tests/end2end/features/"
+ args: "tests/end2end/features/"
runs-on: "${{ matrix.os }}"
steps:
- uses: actions/checkout@v4
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 02d912a50..8282b79cb 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -816,7 +816,7 @@ class WebEngineAudio(browsertab.AbstractAudio):
# Implements the intended two-second delay specified at
# https://doc.qt.io/archives/qt-5.14/qwebenginepage.html#recentlyAudibleChanged
delay_ms = 2000
- self._silence_timer = QTimer(self)
+ self._silence_timer = usertypes.Timer(self)
self._silence_timer.setSingleShot(True)
self._silence_timer.setInterval(delay_ms)
diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 49a97c9cb..c6db54caa 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -12,7 +12,7 @@ from qutebrowser.qt.core import pyqtSlot, QObject, QTimer
from qutebrowser.config import config
from qutebrowser.commands import parser, cmdexc
from qutebrowser.misc import objects, split
-from qutebrowser.utils import log, utils, debug, objreg
+from qutebrowser.utils import log, utils, debug, objreg, usertypes
from qutebrowser.completion.models import miscmodels
from qutebrowser.completion import completionwidget
if TYPE_CHECKING:
@@ -49,7 +49,7 @@ class Completer(QObject):
super().__init__(parent)
self._cmd = cmd
self._win_id = win_id
- self._timer = QTimer()
+ self._timer = usertypes.Timer()
self._timer.setSingleShot(True)
self._timer.setInterval(0)
self._timer.timeout.connect(self._update_completion)
diff --git a/qutebrowser/mainwindow/messageview.py b/qutebrowser/mainwindow/messageview.py
index 38d2a2f9e..8b2e65205 100644
--- a/qutebrowser/mainwindow/messageview.py
+++ b/qutebrowser/mainwindow/messageview.py
@@ -101,7 +101,7 @@ class MessageView(QWidget):
self._vbox.setSpacing(0)
self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
- self._clear_timer = QTimer()
+ self._clear_timer = usertypes.Timer()
self._clear_timer.timeout.connect(self.clear_messages)
config.instance.changed.connect(self._set_clear_timer_interval)
diff --git a/qutebrowser/mainwindow/statusbar/clock.py b/qutebrowser/mainwindow/statusbar/clock.py
index aa2afe8a0..38550bad8 100644
--- a/qutebrowser/mainwindow/statusbar/clock.py
+++ b/qutebrowser/mainwindow/statusbar/clock.py
@@ -8,6 +8,7 @@ from datetime import datetime
from qutebrowser.qt.core import Qt, QTimer
from qutebrowser.mainwindow.statusbar import textbase
+from qutebrowser.utils import usertypes
class Clock(textbase.TextBase):
@@ -20,7 +21,7 @@ class Clock(textbase.TextBase):
super().__init__(parent, elidemode=Qt.TextElideMode.ElideNone)
self.format = ""
- self.timer = QTimer(self)
+ self.timer = usertypes.Timer(self)
self.timer.timeout.connect(self._show_time)
def _show_time(self):
diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py
index 42c31c97e..afbfa0a95 100644
--- a/qutebrowser/mainwindow/tabwidget.py
+++ b/qutebrowser/mainwindow/tabwidget.py
@@ -398,7 +398,7 @@ class TabBar(QTabBar):
self.setStyle(self._our_style)
self.setFocusPolicy(Qt.FocusPolicy.NoFocus)
self.vertical = False
- self._auto_hide_timer = QTimer()
+ self._auto_hide_timer = usertypes.Timer()
self._auto_hide_timer.setSingleShot(True)
self._auto_hide_timer.timeout.connect(self.maybe_hide)
self._on_show_switching_delay_changed()
diff --git a/qutebrowser/misc/httpclient.py b/qutebrowser/misc/httpclient.py
index 6e1a0f577..19186ffb7 100644
--- a/qutebrowser/misc/httpclient.py
+++ b/qutebrowser/misc/httpclient.py
@@ -12,7 +12,7 @@ from qutebrowser.qt.core import pyqtSignal, QObject, QTimer
from qutebrowser.qt.network import (QNetworkAccessManager, QNetworkRequest,
QNetworkReply)
-from qutebrowser.utils import qtlog
+from qutebrowser.utils import qtlog, usertypes
class HTTPRequest(QNetworkRequest):
@@ -85,7 +85,7 @@ class HTTPClient(QObject):
if reply.isFinished():
self.on_reply_finished(reply)
else:
- timer = QTimer(self)
+ timer = usertypes.Timer(self)
timer.setInterval(10000)
timer.timeout.connect(reply.abort)
timer.start()
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 102f57725..a81036c77 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -461,9 +461,9 @@ class Timer(QTimer):
# manual emission?
return
elapsed = time.monotonic() - self._start_time
- if elapsed < self.interval() / 1000 / 2:
+ if elapsed < self.interval() / 1000 / 2 and self._name != "ipc-timeout":
log.misc.warning(
- f"Timer {self._name} (id {self.timerId()} triggered too early: "
+ f"Timer {self._name} (id {self.timerId()}) triggered too early: "
f"interval {self.interval()} but only {elapsed:.3f}s passed")
def setInterval(self, msec: int) -> None: