Merge branch 'master' into dbus-notify

1 files changed, 23 insertions, 5 deletions

diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index a8af02d19..bf167949d 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -33,7 +33,7 @@ import json
 
 import yaml
 import pytest
-from PyQt5.QtCore import pyqtSignal, QUrl, qVersion
+from PyQt5.QtCore import pyqtSignal, QUrl
 
 from qutebrowser.misc import ipc
 from qutebrowser.utils import log, utils, javascript, qtutils
@@ -285,6 +285,23 @@ def is_ignored_chromium_message(line):
         # [5306:5324:0417/151739.362362:ERROR:address_tracker_linux.cc(171)]
         # Could not bind NETLINK socket: Address already in use (98)
         'Could not bind NETLINK socket: Address already in use (98)',
+
+        # Qt 5.15 with AppVeyor
+        # [2968:3108:0601/123442.125:ERROR:mf_helpers.cc(14)] Error in
+        # dxva_video_decode_accelerator_win.cc on line 517
+        'Error in dxva_video_decode_accelerator_win.cc on line 517',
+
+        # Qt 5.15 and debug build
+        # [134188:134199:0609/132454.797229:WARNING:
+        # simple_synchronous_entry.cc(1389)]
+        # Could not open platform files for entry.
+        # [134151:134187:0609/132456.754321:ERROR:process_posix.cc(333)]
+        # Unable to terminate process 134188: No such process (3)
+        # [134151:134187:0609/132456.754414:WARNING:internal_linux.cc(64)]
+        # Failed to read /proc/134188/stat
+        'Could not open platform files for entry.',
+        'Unable to terminate process *: No such process (3)',
+        'Failed to read /proc/*/stat',
     ]
     return any(testutils.pattern_match(pattern=pattern, value=message)
                for pattern in ignored_messages)
@@ -528,9 +545,10 @@ class QuteProc(testprocess.Process):
                 '--backend', backend, '--debug-flag', 'no-sql-history',
                 '--debug-flag', 'werror', '--debug-flag',
                 'test-notification-service']
-        if qVersion() == '5.7.1':
-            # https://github.com/qutebrowser/qutebrowser/issues/3163
-            args += ['--qt-flag', 'disable-seccomp-filter-sandbox']
+
+        if self.request.config.webengine:
+            args += testutils.seccomp_args(qt_flag=True)
+
         args.append('about:blank')
         return args
 
@@ -695,7 +713,7 @@ class QuteProc(testprocess.Process):
             is_dl_inconsistency = str(self.captured_log[-1]).endswith(
                 "_dl_allocate_tls_init: Assertion "
                 "`listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!")
-            if 'TRAVIS' in os.environ and is_dl_inconsistency:
+            if 'CI' in os.environ and is_dl_inconsistency:
                 # WORKAROUND for https://sourceware.org/bugzilla/show_bug.cgi?id=19329
                 self.captured_log = []
                 self._log("NOTE: Restarted after libc DL inconsistency!")