diff options
author | Florian Bruhin <me@the-compiler.org> | 2024-04-30 23:06:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-30 23:06:30 +0200 |
commit | 5152296f7f9d3a656e5b1fac5b5af648863c6224 (patch) | |
tree | 043e932962e177641521d05deea15d7482f862c7 | |
parent | 0fec3c7fb2806d1fa6cb6571757a92a3b15198a8 (diff) | |
parent | a8f4feabb7dbf907745a838b731fd1c63847bfe3 (diff) | |
download | qutebrowser-main.tar.gz qutebrowser-main.zip |
Merge pull request #8179 from qutebrowser/update-dependenciesmain
Update dependencies
-rw-r--r-- | misc/requirements/requirements-tests.txt | 8 | ||||
-rw-r--r-- | qutebrowser/qt/machinery.py | 2 | ||||
-rw-r--r-- | tests/end2end/features/editor.feature | 2 | ||||
-rw-r--r-- | tests/unit/test_qt_machinery.py | 12 |
4 files changed, 13 insertions, 11 deletions
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 6d4cffa03..2a86c3202 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -2,7 +2,7 @@ attrs==23.2.0 beautifulsoup4==4.12.3 -blinker==1.7.0 +blinker==1.8.1 certifi==2024.2.2 charset-normalizer==3.3.2 cheroot==10.0.1 @@ -13,7 +13,7 @@ execnet==2.1.1 filelock==3.13.4 Flask==3.0.3 hunter==3.6.1 -hypothesis==6.100.1 +hypothesis==6.100.2 idna==3.7 importlib_metadata==7.1.0 iniconfig==2.0.0 @@ -30,7 +30,7 @@ parse-type==0.6.2 pluggy==1.5.0 py-cpuinfo==9.0.0 Pygments==2.17.2 -pytest==8.1.2 +pytest==8.2.0 pytest-bdd==7.1.2 pytest-benchmark==4.0.0 pytest-cov==5.0.0 @@ -39,7 +39,7 @@ pytest-mock==3.14.0 pytest-qt==4.4.0 pytest-repeat==0.9.3 pytest-rerunfailures==14.0 -pytest-xdist==3.5.0 +pytest-xdist==3.6.1 pytest-xvfb==3.0.0 PyVirtualDisplay==3.0 requests==2.31.0 diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py index 9f45dd6ce..45a1f6598 100644 --- a/qutebrowser/qt/machinery.py +++ b/qutebrowser/qt/machinery.py @@ -48,7 +48,7 @@ class Error(Exception): """Base class for all exceptions in this module.""" -class Unavailable(Error, ImportError): +class Unavailable(Error, ModuleNotFoundError): """Raised when a module is unavailable with the given wrapper.""" diff --git a/tests/end2end/features/editor.feature b/tests/end2end/features/editor.feature index 9ca855d27..018d65b9f 100644 --- a/tests/end2end/features/editor.feature +++ b/tests/end2end/features/editor.feature @@ -188,6 +188,8 @@ Feature: Opening external editors And I run :cmd-edit Then the error "command must start with one of :/?" should be shown And "Leaving mode KeyMode.command *" should not be logged + And I run :mode-leave + And "Leaving mode KeyMode.command *" should be logged ## select single file diff --git a/tests/unit/test_qt_machinery.py b/tests/unit/test_qt_machinery.py index 25fc83ffd..cf7990393 100644 --- a/tests/unit/test_qt_machinery.py +++ b/tests/unit/test_qt_machinery.py @@ -9,7 +9,7 @@ import sys import html import argparse import typing -from typing import Any, Optional, List, Dict, Union +from typing import Any, Optional, List, Dict, Union, Type import dataclasses import pytest @@ -45,14 +45,14 @@ def undo_init(monkeypatch: pytest.MonkeyPatch) -> None: @pytest.mark.parametrize( - "exception", + "exception, base", [ - machinery.Unavailable(), - machinery.NoWrapperAvailableError(machinery.SelectionInfo()), + (machinery.Unavailable(), ModuleNotFoundError), + (machinery.NoWrapperAvailableError(machinery.SelectionInfo()), ImportError), ], ) -def test_importerror_exceptions(exception: Exception): - with pytest.raises(ImportError): +def test_importerror_exceptions(exception: Exception, base: Type[Exception]): + with pytest.raises(base): raise exception |