diff options
| -rw-r--r-- | pytest.ini | 2 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | tests/end2end/fixtures/quteprocess.py | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/pytest.ini b/pytest.ini index 46a22c5c8..e4d1ba065 100644 --- a/pytest.ini +++ b/pytest.ini @@ -57,6 +57,8 @@ qt_log_ignore = # Qt 6.5 debug build # WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2023-March/045215.html ^QObject::connect: Connecting from COMPAT signal \(QSocketNotifier::activated\(int\)\)$ + # Randomly started showing up on Qt 5.15.2 + ^QBackingStore::endPaint\(\) called with active painter; did you forget to destroy it or call QPainter::end\(\) on it?$ xfail_strict = true filterwarnings = error diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index 6a06faf82..e26e449da 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -7,8 +7,10 @@ RUN sed -i '/^# after the header/a[kde-unstable]\nInclude = /etc/pacman.d/mirror RUN pacman -Sy --noconfirm archlinux-keyring RUN pacman -Su --noconfirm \ git \ + {% if not webengine %} python-tox \ python-distlib \ + {% endif %} {% if qt6 %} qt6-base \ qt6-declarative \ @@ -20,9 +22,10 @@ RUN pacman -Su --noconfirm \ qt5-base \ qt5-declarative \ {% if webengine %} - qt5-webengine python-pyqtwebengine \ + qt5-webengine \ + python-pyqtwebengine \ + python-pyqt5 \ {% endif %} - python-pyqt5 \ {% endif %} xorg-xinit \ xorg-server-xvfb \ @@ -34,7 +37,10 @@ RUN pacman -Su --noconfirm \ {% if not webengine %} RUN pacman -U --noconfirm \ https://archive.archlinux.org/packages/q/qt5-webkit/qt5-webkit-5.212.0alpha4-18-x86_64.pkg.tar.zst \ - https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst + https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst \ + https://archive.archlinux.org/packages/p/python/python-3.10.10-1-x86_64.pkg.tar.zst +RUN python3 -m ensurepip +RUN python3 -m pip install tox pyqt5-sip {% endif %} {% if qt6 %} diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 8fbd62eee..a30129beb 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -73,6 +73,9 @@ def is_ignored_lowlevel_message(message): # fallback. # INVALID: ", source: userscript:_qute_stylesheet (65) '", source: userscript:_qute_stylesheet (65)', + + # Randomly started showing up on Qt 5.15.2 + 'QPaintDevice: Cannot destroy paint device that is being painted', ] return any(testutils.pattern_match(pattern=pattern, value=message) for pattern in ignored_messages) |