summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-07-03 11:41:56 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-07-03 11:43:19 +0200
commit65a610c3bff143417e33429968314e641e95d516 (patch)
tree7d11a7e4b5519dfb579cced93aabbc4888b571b0 /tests/conftest.py
parent1d398e9d8edd49d2dcda8bec0d221740d6c5dce4 (diff)
downloadqutebrowser-65a610c3bff143417e33429968314e641e95d516.tar.gz
qutebrowser-65a610c3bff143417e33429968314e641e95d516.zip
tests: Widen disable-bpf-sandbox argument
This should fix tests with newer kernels/glibc's with Qt versions before 5.14.1.
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index cd0e9ce2d..32a3144c5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -28,7 +28,7 @@ import pathlib
import pytest
import hypothesis
-from PyQt5.QtCore import qVersion, PYQT_VERSION
+from PyQt5.QtCore import PYQT_VERSION
pytest.register_assert_rewrite('helpers')
@@ -197,12 +197,10 @@ def pytest_ignore_collect(path):
@pytest.fixture(scope='session')
def qapp_args():
- """Make QtWebEngine unit tests run on Qt 5.7.1.
-
- See https://github.com/qutebrowser/qutebrowser/issues/3163
- """
- if qVersion() == '5.7.1':
- return [sys.argv[0], '--disable-seccomp-filter-sandbox']
+ """Make QtWebEngine unit tests run on older Qt versions + newer kernels."""
+ seccomp_args = testutils.seccomp_args(qt_flag=False)
+ if seccomp_args:
+ return [sys.argv[0]] + seccomp_args
return []