pytest_httpserver 1.1.0__tar.gz → 1.1.2__tar.gz

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/CHANGES.rst

@@ -2,6 +2,34 @@
 Release Notes
 =============
 
+.. _Release Notes_1.1.2:
+
+1.1.2
+=====
+
+.. _Release Notes_1.1.2_Deprecation Notes:
+
+Deprecation Notes
+-----------------
+
+- Python versions earlier than 3.9 have been deprecated in order to make the
+  code more type safe. Python 3.8 has reached EOL on 2024-10-07.
+
+
+.. _Release Notes_1.1.1:
+
+1.1.1
+=====
+
+.. _Release Notes_1.1.1_New Features:
+
+New Features
+------------
+
+- Add a new ``expect`` method to the ``HTTPServer`` object which allows
+  developers to provide their own request matcher object.
+
+
 .. _Release Notes_1.1.0:
 
 1.1.0

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/PKG-INFO

@@ -1,23 +1,23 @@
 Metadata-Version: 2.1
 Name: pytest_httpserver
-Version: 1.1.0
+Version: 1.1.2
 Summary: pytest-httpserver is a httpserver for pytest
 Home-page: https://github.com/csernazs/pytest-httpserver
 License: MIT
 Author: Zsolt Cserna
 Author-email: cserna.zsolt@gmail.com
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: Werkzeug (>=2.0.0)
 Project-URL: Bug Tracker, https://github.com/csernazs/pytest-httpserver/issues
@@ -25,7 +25,7 @@ Project-URL: Documentation, https://pytest-httpserver.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/csernazs/pytest-httpserver
 Description-Content-Type: text/markdown
 
-[![Build Status](https://github.com/csernazs/pytest-httpserver/workflows/build/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
+[![Build Status](https://github.com/csernazs/pytest-httpserver/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/pytest-httpserver/badge/?version=latest)](https://pytest-httpserver.readthedocs.io/en/latest/?badge=latest)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://codecov.io/gh/csernazs/pytest-httpserver/branch/master/graph/badge.svg?token=MX2JXbHqRH)](https://codecov.io/gh/csernazs/pytest-httpserver)

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/csernazs/pytest-httpserver/workflows/build/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
+[![Build Status](https://github.com/csernazs/pytest-httpserver/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/csernazs/pytest-httpserver/actions?query=workflow%3Abuild+branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/pytest-httpserver/badge/?version=latest)](https://pytest-httpserver.readthedocs.io/en/latest/?badge=latest)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![codecov](https://codecov.io/gh/csernazs/pytest-httpserver/branch/master/graph/badge.svg?token=MX2JXbHqRH)](https://codecov.io/gh/csernazs/pytest-httpserver)

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/doc/conf.py

@@ -68,7 +68,7 @@ author = "Zsolt Cserna"
 # built documents.
 #
 # The short X.Y version.
-version = "1.1.0"
+version = "1.1.2"
 # The full version, including alpha/beta/rc tags.
 release = version
 

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/doc/howto.rst

@@ -238,6 +238,17 @@ these.
     the server.
 
 
+Using custom request matcher
+----------------------------
+In the case when you want to extend or modify the request matcher in
+*pytest-httpserrver*, then you can use your own request matcher.
+
+Example:
+
+.. literalinclude :: ../tests/examples/test_howto_custom_request_matcher.py
+   :language: python
+
+
 Customizing host and port
 -------------------------
 

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest_httpserver"
-version = "1.1.0"
+version = "1.1.2"
 description = "pytest-httpserver is a httpserver for pytest"
 authors = ["Zsolt Cserna <cserna.zsolt@gmail.com>"]
 license = "MIT"
@@ -24,7 +24,7 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8"
+python = ">=3.9"
 Werkzeug = ">= 2.0.0"
 
 
@@ -41,14 +41,13 @@ optional = true
 pre-commit = ">=2.20,<4.0"
 requests = "*"
 Sphinx = ">=5.1.1,<8.0.0"
-sphinx-rtd-theme = ">=1,<3"
+sphinx-rtd-theme = ">=1,<4"
 reno = "*"
 types-requests = "*"
 pytest = ">=7.1.3,<9.0.0"
 pytest-cov = ">=3,<6"
 coverage = ">=6.4.4,<8.0.0"
-types-toml = "*"
-toml = "^0.10.2"
+tomli = { version = "*", markers = "python_version < '3.11'"}
 black = "*"
 ruff = "*"
 mypy = "*"
@@ -59,7 +58,7 @@ optional = true
 
 [tool.poetry.group.doc.dependencies]
 Sphinx = ">=5.1.1,<8.0.0"
-sphinx-rtd-theme = ">=1,<3"
+sphinx-rtd-theme = ">=1,<4"
 
 
 [tool.poetry.group.test]
@@ -72,8 +71,7 @@ coverage = "*"
 requests = "*"
 types-requests = "*"
 pre-commit = "*"
-types-toml = "*"
-toml = "*"
+tomli = { version = "*", markers = "python_version < '3.11'"}
 mypy = "*"
 
 [build-system]
@@ -139,5 +137,5 @@ lint.ignore = [
   "UP032",
 ]
 line-length = 120
-target-version = "py38"
+target-version = "py39"
 exclude = ["doc", "example*.py", "tests/examples/*.py"]

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/pytest_httpserver/blocking_httpserver.py

@@ -4,8 +4,6 @@ from queue import Empty
 from queue import Queue
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Mapping
-from typing import Pattern
 
 from pytest_httpserver.httpserver import METHOD_ALL
 from pytest_httpserver.httpserver import UNDEFINED
@@ -16,6 +14,8 @@ from pytest_httpserver.httpserver import RequestHandlerBase
 from pytest_httpserver.httpserver import URIPattern
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+    from re import Pattern
     from ssl import SSLContext
 
     from werkzeug import Request

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/pytest_httpserver/httpserver.py

@@ -9,20 +9,19 @@ import threading
 import time
 import urllib.parse
 from collections import defaultdict
+from collections.abc import Iterable
+from collections.abc import Mapping
+from collections.abc import MutableMapping
 from contextlib import contextmanager
 from contextlib import suppress
 from copy import copy
 from enum import Enum
+from re import Pattern
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
 from typing import ClassVar
-from typing import Iterable
-from typing import Mapping
-from typing import MutableMapping
 from typing import Optional
-from typing import Pattern
-from typing import Tuple
 from typing import Union
 
 import werkzeug.http
@@ -34,13 +33,16 @@ from werkzeug.serving import make_server
 
 if TYPE_CHECKING:
     from ssl import SSLContext
+    from types import TracebackType
+
+    from werkzeug.serving import BaseWSGIServer
 
 URI_DEFAULT = ""
 METHOD_ALL = "__ALL"
 
 HEADERS_T = Union[
     Mapping[str, Union[str, Iterable[str]]],
-    Iterable[Tuple[str, str]],
+    Iterable[tuple[str, str]],
 ]
 
 HVMATCHER_T = Callable[[str, Optional[str], str], bool]
@@ -113,11 +115,13 @@ class Waiting:
 
     @property
     def result(self) -> bool:
-        return self._result
+        return bool(self._result)
 
     @property
     def elapsed_time(self) -> float:
         """Elapsed time in seconds"""
+        if self._stop is None:
+            raise TypeError("unsupported operand type(s) for -: 'NoneType' and 'float'")
         return self._stop - self._start
 
 
@@ -139,7 +143,7 @@ class HeaderValueMatcher:
         func = getattr(Authorization, "from_header", None)
         if func is None:  # Werkzeug < 2.3.0
             func = werkzeug.http.parse_authorization_header  # type: ignore[attr-defined]
-        return func(actual) == func(expected)
+        return func(actual) == func(expected)  # type: ignore
 
     @staticmethod
     def default_header_value_matcher(actual: str | None, expected: str) -> bool:
@@ -174,7 +178,7 @@ class QueryMatcher(abc.ABC):
         return values[0] == values[1]
 
     @abc.abstractmethod
-    def get_comparing_values(self, request_query_string: bytes) -> tuple:
+    def get_comparing_values(self, request_query_string: bytes) -> tuple[Any, Any]:
         pass
 
 
@@ -195,10 +199,10 @@ class StringQueryMatcher(QueryMatcher):
 
         self.query_string = query_string
 
-    def get_comparing_values(self, request_query_string: bytes) -> tuple:
+    def get_comparing_values(self, request_query_string: bytes) -> tuple[bytes, bytes]:
         if isinstance(self.query_string, str):
             query_string = self.query_string.encode()
-        elif isinstance(self.query_string, bytes):
+        elif isinstance(self.query_string, bytes):  # type: ignore
             query_string = self.query_string
         else:
             raise TypeError("query_string must be a string, or a bytes-like object")
@@ -211,7 +215,7 @@ class MappingQueryMatcher(QueryMatcher):
     Matches a query string to a dictionary or MultiDict specified
     """
 
-    def __init__(self, query_dict: Mapping | MultiDict):
+    def __init__(self, query_dict: Mapping[str, str] | MultiDict[str, str]):
         """
         :param query_dict: if dictionary (Mapping) is specified, it will be used as a
             key-value mapping where both key and value should be string. If there are multiple
@@ -221,7 +225,7 @@ class MappingQueryMatcher(QueryMatcher):
         """
         self.query_dict = query_dict
 
-    def get_comparing_values(self, request_query_string: bytes) -> tuple:
+    def get_comparing_values(self, request_query_string: bytes) -> tuple[Mapping[str, str], Mapping[str, str]]:
         query = MultiDict(urllib.parse.parse_qsl(request_query_string.decode("utf-8")))
         if isinstance(self.query_dict, MultiDict):
             return (query, self.query_dict)
@@ -241,14 +245,14 @@ class BooleanQueryMatcher(QueryMatcher):
         """
         self.result = result
 
-    def get_comparing_values(self, request_query_string):  # noqa: ARG002
+    def get_comparing_values(self, request_query_string: bytes):  # noqa: ARG002
         if self.result:
             return (True, True)
         else:
             return (True, False)
 
 
-def _create_query_matcher(query_string: None | QueryMatcher | str | bytes | Mapping) -> QueryMatcher:
+def _create_query_matcher(query_string: None | QueryMatcher | str | bytes | Mapping[str, str]) -> QueryMatcher:
     if isinstance(query_string, QueryMatcher):
         return query_string
 
@@ -312,7 +316,7 @@ class RequestMatcher:
         data: str | bytes | None = None,
         data_encoding: str = "utf-8",
         headers: Mapping[str, str] | None = None,
-        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping[str, str] = None,
         header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ):
@@ -410,7 +414,7 @@ class RequestMatcher:
 
         return json_received == self.json
 
-    def difference(self, request: Request) -> list[tuple]:
+    def difference(self, request: Request) -> list[tuple[str, str, str | URIPattern]]:
         """
         Calculates the difference between the matcher and the request.
 
@@ -422,7 +426,7 @@ class RequestMatcher:
         matches the fields set in the matcher object.
         """
 
-        retval: list[tuple] = []
+        retval: list[tuple[str, Any, Any]] = []
 
         if not self.match_uri(request):
             retval.append(("uri", request.path, self.uri))
@@ -433,8 +437,8 @@ class RequestMatcher:
         if not self.query_matcher.match(request.query_string):
             retval.append(("query_string", request.query_string, self.query_string))
 
-        request_headers = {}
-        expected_headers = {}
+        request_headers: dict[str, str | None] = {}
+        expected_headers: dict[str, str] = {}
         for key, value in self.headers.items():
             if not self.header_value_matcher(key, request.headers.get(key), value):
                 request_headers[key] = request.headers.get(key)
@@ -467,7 +471,7 @@ class RequestHandlerBase(abc.ABC):
 
     def respond_with_json(
         self,
-        response_json,
+        response_json: Any,
         status: int = 200,
         headers: Mapping[str, str] | None = None,
         content_type: str = "application/json",
@@ -578,7 +582,7 @@ class RequestHandler(RequestHandlerBase):
         return retval
 
 
-class RequestHandlerList(list):
+class RequestHandlerList(list[RequestHandler]):
     """
     Represents a list of :py:class:`RequestHandler` objects.
 
@@ -638,9 +642,9 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         """
         self.host = host
         self.port = port
-        self.server = None
-        self.server_thread = None
-        self.assertions: list[str] = []
+        self.server: BaseWSGIServer | None = None
+        self.server_thread: threading.Thread | None = None
+        self.assertions: list[str | AssertionError] = []
         self.handler_errors: list[Exception] = []
         self.log: list[tuple[Request, Response]] = []
         self.ssl_context = ssl_context
@@ -727,7 +731,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
 
         This should not be called directly, but can be overridden to tailor it to your needs.
         """
-
+        assert self.server is not None
         self.server.serve_forever()
 
     def is_running(self) -> bool:
@@ -736,7 +740,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         """
         return bool(self.server)
 
-    def start(self):
+    def start(self) -> None:
         """
         Start the server in a thread.
 
@@ -755,9 +759,16 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         if self.is_running():
             raise HTTPServerError("Server is already running")
 
+        app = Request.application(self.application)
+
         self.server = make_server(
-            self.host, self.port, self.application, ssl_context=self.ssl_context, threaded=self.threaded
+            self.host,
+            self.port,
+            app,
+            ssl_context=self.ssl_context,
+            threaded=self.threaded,
         )
+
         self.port = self.server.port  # Update port (needed if `port` was set to 0)
         self.server_thread = threading.Thread(target=self.thread_target)
         self.server_thread.start()
@@ -772,6 +783,8 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         Only a running server can be stopped. If the sever is not running, :py:class`HTTPServerError`
         will be raised.
         """
+        assert self.server is not None
+        assert self.server_thread is not None
         if not self.is_running():
             raise HTTPServerError("Server is not running")
         self.server.shutdown()
@@ -779,7 +792,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         self.server = None
         self.server_thread = None
 
-    def add_assertion(self, obj):
+    def add_assertion(self, obj: str | AssertionError):
         """
         Add a new assertion
 
@@ -848,8 +861,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
         :return: the response object what the handler responded, or a response which contains the error
         """
 
-    @Request.application  # type: ignore
-    def application(self, request: Request):
+    def application(self, request: Request) -> Response:
         """
         Entry point of werkzeug.
 
@@ -875,7 +887,12 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
             self.start()
         return self
 
-    def __exit__(self, *args, **kwargs):
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ):
         """
         Provide the context API
 
@@ -886,7 +903,7 @@ class HTTPServerBase(abc.ABC):  # pylint: disable=too-many-instance-attributes
             self.stop()
 
     @staticmethod
-    def format_host(host):
+    def format_host(host: str):
         """
         Formats a hostname so it can be used in a URL.
         Notably, this adds brackets around IPV6 addresses when
@@ -929,8 +946,8 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
 
     def __init__(
         self,
-        host=DEFAULT_LISTEN_HOST,
-        port=DEFAULT_LISTEN_PORT,
+        host: str = DEFAULT_LISTEN_HOST,
+        port: int = DEFAULT_LISTEN_PORT,
         ssl_context: SSLContext | None = None,
         default_waiting_settings: WaitingSettings | None = None,
         *,
@@ -972,6 +989,22 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         self.oneshot_handlers = RequestHandlerList()
         self.handlers = RequestHandlerList()
 
+    def expect(self, matcher: RequestMatcher, handler_type: HandlerType = HandlerType.PERMANENT) -> RequestHandler:
+        """
+        Create and register a request handler.
+
+        :param matcher: :py:class:`RequestMatcher` used to match requests.
+        :param handler_type: type of handler
+        """
+        request_handler = RequestHandler(matcher)
+        if handler_type == HandlerType.PERMANENT:
+            self.handlers.append(request_handler)
+        elif handler_type == HandlerType.ONESHOT:
+            self.oneshot_handlers.append(request_handler)
+        elif handler_type == HandlerType.ORDERED:
+            self.ordered_handlers.append(request_handler)
+        return request_handler
+
     def expect_request(
         self,
         uri: str | URIPattern | Pattern[str],
@@ -979,7 +1012,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         data: str | bytes | None = None,
         data_encoding: str = "utf-8",
         headers: Mapping[str, str] | None = None,
-        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping[str, str] = None,
         header_value_matcher: HVMATCHER_T | None = None,
         handler_type: HandlerType = HandlerType.PERMANENT,
         json: Any = UNDEFINED,
@@ -1062,7 +1095,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         data: str | bytes | None = None,
         data_encoding: str = "utf-8",
         headers: Mapping[str, str] | None = None,
-        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping[str, str] = None,
         header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ) -> RequestHandler:
@@ -1117,7 +1150,7 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         data: str | bytes | None = None,
         data_encoding: str = "utf-8",
         headers: Mapping[str, str] | None = None,
-        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping[str, str] = None,
         header_value_matcher: HVMATCHER_T | None = None,
         json: Any = UNDEFINED,
     ) -> RequestHandler:
@@ -1175,13 +1208,13 @@ class HTTPServer(HTTPServerBase):  # pylint: disable=too-many-instance-attribute
         This method is primarily used when reporting errors.
         """
 
-        def format_handlers(handlers):
+        def format_handlers(handlers: list[RequestHandler]):
             if handlers:
                 return ["    {!r}".format(handler.matcher) for handler in handlers]
             else:
                 return ["    none"]
 
-        lines = []
+        lines: list[str] = []
         lines.append("Ordered matchers:")
         lines.extend(format_handlers(self.ordered_handlers))
         lines.append("")

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/pytest_httpserver/pytest_plugin.py

@@ -61,7 +61,7 @@ def pytest_sessionfinish(session, exitstatus):  # noqa: ARG001
             Plugin.SERVER.stop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def httpserver(make_httpserver):
     server = make_httpserver
     server.clear()
@@ -78,7 +78,7 @@ def make_httpserver_ipv4(httpserver_ssl_context):
         server.stop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def httpserver_ipv4(make_httpserver_ipv4):
     server = make_httpserver_ipv4
     server.clear()
@@ -95,7 +95,7 @@ def make_httpserver_ipv6(httpserver_ssl_context):
         server.stop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def httpserver_ipv6(make_httpserver_ipv6):
     server = make_httpserver_ipv6
     server.clear()

pytest_httpserver-1.1.2/tests/examples/test_howto_custom_request_matcher.py

@@ -0,0 +1,37 @@
+import requests
+from werkzeug import Request
+
+from pytest_httpserver import HTTPServer
+from pytest_httpserver import RequestMatcher
+
+
+class MyMatcher(RequestMatcher):
+    def match(self, request: Request) -> bool:
+        match = super().match(request)
+        if not match:  # existing parameters didn't match -> return with False
+            return match
+
+        # match the json's "value" key: if it is an integer and it is an even
+        # number, it returns True
+        json = request.json
+        if isinstance(json, dict) and isinstance(json.get("value"), int):
+            return json["value"] % 2 == 0
+
+        return False
+
+
+def test_custom_request_matcher(httpserver: HTTPServer):
+    httpserver.expect(MyMatcher("/foo")).respond_with_data("OK")
+
+    # with even number it matches the request
+    resp = requests.post(httpserver.url_for("/foo"), json={"value": 42})
+    resp.raise_for_status()
+    assert resp.text == "OK"
+
+    resp = requests.post(httpserver.url_for("/foo"), json={"value": 198})
+    resp.raise_for_status()
+    assert resp.text == "OK"
+
+    # with an odd number, it does not match the request
+    resp = requests.post(httpserver.url_for("/foo"), json={"value": 43})
+    assert resp.status_code == 500

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_blocking_httpserver.py

@@ -40,7 +40,7 @@ def then_the_response_is_got_from(server_connection, response):
     assert server_connection.get(timeout=9).json() == response
 
 
-@pytest.fixture()
+@pytest.fixture
 def httpserver():
     server = BlockingHTTPServer(timeout=1)
     server.start()
@@ -122,4 +122,4 @@ def test_raises_assertion_error_when_request_was_not_responded(httpserver: Block
 
 
 def test_repr(httpserver: BlockingHTTPServer):
-    assert repr(httpserver) == f"<BlockingHTTPServer host=localhost port={httpserver.port}>"
+    assert repr(httpserver) == f"<BlockingHTTPServer host={httpserver.host} port={httpserver.port}>"

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_log_leak.py

@@ -13,7 +13,7 @@ class Client:
             requests.get(self.url)
 
 
-@pytest.fixture()
+@pytest.fixture
 def my_fixture():
     client = Client()
     yield client

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_log_querying.py

@@ -47,7 +47,7 @@ def test_verify_assert_msg(httpserver: HTTPServer):
         "Path: /foo",
         "Method: GET",
         "Body: b''",
-        f"Headers: Host: localhost:{httpserver.port}",
+        f"Headers: Host: {httpserver.host}:{httpserver.port}",
         "User-Agent: requests",
         "Accept-Encoding: gzip, deflate",
         "Accept: */*",

pytest_httpserver-1.1.2/tests/test_matcher.py

@@ -0,0 +1,11 @@
+import requests
+
+from pytest_httpserver import HTTPServer
+
+
+def test_expect_method(httpserver: HTTPServer):
+    expected_response = "OK"
+    matcher = httpserver.create_matcher(uri="/test", method="POST")
+    httpserver.expect(matcher).respond_with_data(expected_response)
+    resp = requests.post(httpserver.url_for("/test"), json={"list": [1, 2, 3, 4]})
+    assert resp.text == expected_response

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_mixed.py

@@ -85,4 +85,4 @@ def test_all_ordered_missing(httpserver: HTTPServer):
 
 
 def test_repr(httpserver: HTTPServer):
-    assert repr(httpserver) == f"<HTTPServer host=localhost port={httpserver.port}>"
+    assert repr(httpserver) == f"<HTTPServer host={httpserver.host} port={httpserver.port}>"

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_port_changing.py

@@ -9,7 +9,7 @@ PORT_KEY = "PYTEST_HTTPSERVER_PORT"
 HOST_KEY = "PYTEST_HTTPSERVER_HOST"
 
 
-@pytest.fixture()
+@pytest.fixture
 def tmpenv():
     old_vars = {}
     for key in (HOST_KEY, PORT_KEY):

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_release.py

@@ -8,10 +8,19 @@ import tarfile
 import zipfile
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterable
+from typing import TYPE_CHECKING
 
 import pytest
-import toml
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+try:
+    import tomllib
+except ImportError:
+    # Unfortunately mypy cannot handle this try/expect pattern, and "type: ignore"
+    # is the simplest work-around. See: https://github.com/python/mypy/issues/1153
+    import tomli as tomllib  # type: ignore
 
 # TODO: skip if poetry is not available or add mark to test it explicitly
 
@@ -20,7 +29,7 @@ pytestmark = pytest.mark.release
 
 NAME = "pytest-httpserver"
 NAME_UNDERSCORE = NAME.replace("-", "_")
-PY_MAX_VERSION = (3, 12)
+PY_MAX_VERSION = (3, 13)
 
 
 @pytest.fixture(scope="session")
@@ -31,8 +40,8 @@ def pyproject_path() -> Path:
 @pytest.fixture(scope="session")
 def pyproject(pyproject_path: Path):
     assert pyproject_path.is_file()
-    with pyproject_path.open() as infile:
-        pyproject = toml.load(infile)
+    with pyproject_path.open("rb") as infile:
+        pyproject = tomllib.load(infile)
     return pyproject
 
 
@@ -228,6 +237,7 @@ def test_sdist_contents(build: Build, version: str):
             "test_urimatch.py",
             "test_wait.py",
             "test_with_statement.py",
+            "test_matcher.py",
         },
     }
 

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_ssl.py

@@ -5,6 +5,8 @@ from os.path import join as pjoin
 import pytest
 import requests
 
+from pytest_httpserver import HTTPServer
+
 pytestmark = pytest.mark.ssl
 
 test_dir = os.path.dirname(os.path.realpath(__file__))
@@ -24,18 +26,23 @@ def httpserver_ssl_context():
     return ssl.SSLContext(protocol)
 
 
-def test_ssl(httpserver):
+def test_ssl(httpserver: HTTPServer):
     server_crt = pjoin(assets_dir, "server.crt")
     server_key = pjoin(assets_dir, "server.key")
     root_ca = pjoin(assets_dir, "rootCA.crt")
-    context = httpserver.ssl_context
 
     assert (
-        context is not None
+        httpserver.ssl_context is not None
     ), "SSLContext not set. The session was probably started with a test that did not define an SSLContext."
 
     httpserver.ssl_context.load_cert_chain(server_crt, server_key)
     httpserver.expect_request("/foobar").respond_with_json({"foo": "bar"})
 
     assert httpserver.is_running()
-    assert requests.get(httpserver.url_for("/foobar"), verify=root_ca).json() == {"foo": "bar"}
+
+    assert httpserver.url_for("/").startswith("https://")
+
+    # ensure we are using "localhost" and not "127.0.0.1" to pass cert verification
+    url = f"https://localhost:{httpserver.port}/foobar"
+
+    assert requests.get(url, verify=root_ca).json() == {"foo": "bar"}

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/tests/test_threaded.py

@@ -1,7 +1,7 @@
 import http.client
 import threading
 import time
-from typing import Iterable
+from collections.abc import Iterable
 
 import pytest
 from werkzeug import Request
@@ -10,7 +10,7 @@ from werkzeug import Response
 from pytest_httpserver import HTTPServer
 
 
-@pytest.fixture()
+@pytest.fixture
 def threaded() -> Iterable[HTTPServer]:
     server = HTTPServer(threaded=True)
     server.start()
@@ -33,8 +33,6 @@ def test_threaded(threaded: HTTPServer):
 
     threaded.expect_request("/foo").respond_with_handler(handler)
 
-    t_start = time.perf_counter()
-
     number_of_connections = 5
     conns = [http.client.HTTPConnection(threaded.host, threaded.port) for _ in range(number_of_connections)]
 
@@ -51,10 +49,4 @@ def test_threaded(threaded: HTTPServer):
     for conn in conns:
         conn.close()
 
-    t_elapsed = time.perf_counter() - t_start
-
     assert len(thread_ids) == len(set(thread_ids)), "thread ids returned should be unique"
-
-    assert (
-        t_elapsed < number_of_connections * sleep_time * 0.9
-    ), "elapsed time should be less than processing sequential requests"

{pytest_httpserver-1.1.0 → pytest_httpserver-1.1.2}/pytest_httpserver/__init__.py

@@ -4,19 +4,19 @@ This is package provides the main API for the pytest_httpserver package.
 """
 
 __all__ = [
+    "METHOD_ALL",
+    "URI_DEFAULT",
+    "BlockingHTTPServer",
+    "BlockingRequestHandler",
+    "Error",
     "HTTPServer",
     "HTTPServerError",
-    "Error",
-    "NoHandlerError",
-    "WaitingSettings",
     "HeaderValueMatcher",
+    "NoHandlerError",
     "RequestHandler",
     "RequestMatcher",
     "URIPattern",
-    "URI_DEFAULT",
-    "METHOD_ALL",
-    "BlockingHTTPServer",
-    "BlockingRequestHandler",
+    "WaitingSettings",
 ]
 
 from .blocking_httpserver import BlockingHTTPServer