diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-06-25 21:48:12 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-06-25 21:48:12 +0200 |
commit | 036af8519915e455d20254a66c04cf1d51bcd9e7 (patch) | |
tree | 1fe92abd8c123d6f09a342c3b3e9284a03f6cf47 | |
parent | 28f437c21491e012ba00f0a756a832c5a510f1c2 (diff) | |
download | qutebrowser-036af8519915e455d20254a66c04cf1d51bcd9e7.tar.gz qutebrowser-036af8519915e455d20254a66c04cf1d51bcd9e7.zip |
Revert "Work around Python 3.12 test issues"
Fixed with newest PyQt snapshot.
This reverts commit c62e9aba5b3a07c3f2d821e8efa2bfff4e572997.
-rw-r--r-- | tests/end2end/test_invocations.py | 4 | ||||
-rw-r--r-- | tests/unit/utils/test_standarddir.py | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py index 164bf516e..ce38eec24 100644 --- a/tests/end2end/test_invocations.py +++ b/tests/end2end/test_invocations.py @@ -275,9 +275,7 @@ def test_version(request): print(stderr) assert ok - if sys.version_info != (3, 12, 0, "beta", 2): - # WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2023-June/045331.html - assert proc.exitStatus() == QProcess.ExitStatus.NormalExit + assert proc.exitStatus() == QProcess.ExitStatus.NormalExit match = re.search(r'^qutebrowser\s+v\d+(\.\d+)', stdout, re.MULTILINE) assert match is not None diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py index 0ce8001b1..ef1da5a07 100644 --- a/tests/unit/utils/test_standarddir.py +++ b/tests/unit/utils/test_standarddir.py @@ -482,10 +482,9 @@ def test_no_qapplication(qapp, tmpdir, monkeypatch): home_dir.ensure(dir=True) monkeypatch.setenv('HOME', str(home_dir)) - # check=False on Python 3.12 as WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2023-June/045331.html proc = subprocess.run([sys.executable, str(pyfile)] + sys.path, text=True, - check=sys.version_info != (3, 12, 0, "beta", 2), + check=True, stdout=subprocess.PIPE) sub_locations = json.loads(proc.stdout) |