pytest_httpserver 1.0.9__tar.gz → 1.0.11__tar.gz

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/CHANGES.rst

@@ -2,6 +2,46 @@
 Release Notes
 =============
 
+.. _Release Notes_1.0.11:
+
+1.0.11
+======
+
+.. _Release Notes_1.0.11_New Features:
+
+New Features
+------------
+
+- Hooks API
+
+- New methods added to query for matching requests in the log.
+
+- Threading support to serve requests in parallel
+
+
+.. _Release Notes_1.0.10:
+
+1.0.10
+======
+
+.. _Release Notes_1.0.10_New Features:
+
+New Features
+------------
+
+- When there's no handler for the request, add more details to the response
+  sent by the server about the request to help debugging.
+
+
+.. _Release Notes_1.0.10_Other Notes:
+
+Other Notes
+-----------
+
+- Use ruff for linting. It includes some source code changes which should not
+  introduce functional changes, or API changes.
+
+
 .. _Release Notes_1.0.9:
 
 1.0.9

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest_httpserver
-Version: 1.0.9
+Version: 1.0.11
 Summary: pytest-httpserver is a httpserver for pytest
 Home-page: https://github.com/csernazs/pytest-httpserver
 License: MIT
@@ -27,10 +27,12 @@ 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)
 [![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)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=K6PU3AGBZW4QC&item_name=pytest-httpserver&currency_code=EUR&source=url)
+[![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)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Downloads](https://static.pepy.tech/badge/pytest-httpserver/month)](https://pepy.tech/project/pytest-httpserver)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 ## pytest_httpserver
 
@@ -144,12 +146,16 @@ documentation](https://pytest-httpserver.readthedocs.io/en/latest/api.html#block
 
 ### Donation
 
-If you want to donate to this project, you can find the donate button at the top
-of the README.
+Currently, this project is based heavily on werkzeug and pytest.
 
-Currently, this project is based heavily on werkzeug. Werkzeug does all the heavy lifting
-behind the scenes, parsing HTTP request and defining Request and Response objects, which
-are currently transparent in the API.
+Werkzeug does all the heavy lifting behind the scenes, parsing HTTP request and
+defining Request and Response objects, which are currently transparent in the
+API.
 
-If you wish to donate, please consider donating to them: https://palletsprojects.com/donate
+If you wish to donate to werkzeug: https://palletsprojects.com/donate
+
+
+Pytest is the de-facto test library for python.
+
+If you wish to donate to pytest: https://opencollective.com/pytest
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/README.md

@@ -1,9 +1,11 @@
 [![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)
 [![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)
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=K6PU3AGBZW4QC&item_name=pytest-httpserver&currency_code=EUR&source=url)
+[![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)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Downloads](https://static.pepy.tech/badge/pytest-httpserver/month)](https://pepy.tech/project/pytest-httpserver)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 
 ## pytest_httpserver
 
@@ -117,11 +119,15 @@ documentation](https://pytest-httpserver.readthedocs.io/en/latest/api.html#block
 
 ### Donation
 
-If you want to donate to this project, you can find the donate button at the top
-of the README.
+Currently, this project is based heavily on werkzeug and pytest.
 
-Currently, this project is based heavily on werkzeug. Werkzeug does all the heavy lifting
-behind the scenes, parsing HTTP request and defining Request and Response objects, which
-are currently transparent in the API.
+Werkzeug does all the heavy lifting behind the scenes, parsing HTTP request and
+defining Request and Response objects, which are currently transparent in the
+API.
 
-If you wish to donate, please consider donating to them: https://palletsprojects.com/donate
+If you wish to donate to werkzeug: https://palletsprojects.com/donate
+
+
+Pytest is the de-facto test library for python.
+
+If you wish to donate to pytest: https://opencollective.com/pytest

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/doc/api.rst

@@ -24,6 +24,13 @@ RequestHandler
         :inherited-members:
 
 
+RequestMatcher
+~~~~~~~~~~~~~~
+
+    .. autoclass:: RequestMatcher
+        :members:
+
+
 BlockingHTTPServer
 ~~~~~~~~~~~~~~~~~~
 
@@ -93,3 +100,19 @@ by the user.
 
     .. autoclass:: pytest_httpserver.httpserver.RequestHandlerList
         :members:
+
+
+pytest_httpserver.hooks
+-----------------------
+
+.. automodule:: pytest_httpserver.hooks
+
+
+    .. autoclass:: pytest_httpserver.hooks.Chain
+        :members:
+
+    .. autoclass:: pytest_httpserver.hooks.Delay
+        :members:
+
+    .. autoclass:: pytest_httpserver.hooks.Garbage
+        :members:

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/doc/conf.py

@@ -24,6 +24,7 @@ from typing import Dict
 
 sys.path.insert(0, os.path.abspath(".."))
 
+import doc.patch
 
 # -- General configuration ------------------------------------------------
 
@@ -37,11 +38,12 @@ sys.path.insert(0, os.path.abspath(".."))
 extensions = [
     "sphinx.ext.autodoc",
     "sphinx.ext.intersphinx",
+    "sphinx.ext.autosectionlabel",
 ]
 
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3", (None, "python-inv.txt")),
-    "werkzeug": ("https://werkzeug.palletsprojects.com/en/2.1.x", None),
+    "werkzeug": ("https://werkzeug.palletsprojects.com/en/3.0.x", None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
@@ -66,7 +68,7 @@ author = "Zsolt Cserna"
 # built documents.
 #
 # The short X.Y version.
-version = "1.0.9"
+version = "1.0.11"
 # The full version, including alpha/beta/rc tags.
 release = version
 

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/doc/howto.rst

@@ -512,3 +512,149 @@ Example:
 
 .. literalinclude :: ../tests/examples/test_example_blocking_httpserver.py
    :language: python
+
+
+Querying the log
+----------------
+
+*pytest-httpserver* keeps a log of request-response pairs in a python list. This
+log can be accessed by the ``log`` attibute of the httpserver instance, but
+there are methods made specifically to query the log.
+
+Each of the log querying methods accepts a
+:py:class:`pytest_httpserver.RequestMatcher` object which uses the same matching
+logic which is used by the server itself. Its parameters are the same to the
+parameters specified for the server's `except_request` (and the similar) methods.
+
+The methods for querying:
+
+* :py:meth:`pytest_httpserver.HTTPServer.get_matching_requests_count` returns
+  how many requests are matching in the log as an int
+
+* :py:meth:`pytest_httpserver.HTTPServer.assert_request_made` asserts the given
+  amount of requests are matching in the log. By default it checks for one (1)
+  request but other value can be specified. For example, 0 can be specified to
+  check for requests not made.
+
+* :py:meth:`pytest_httpserver.HTTPServer.iter_matching_requests` is a generator
+  yielding Request-Response tuples of the matching entries in the log. This
+  offers greater flexibility (compared to the other methods)
+
+Example:
+
+.. literalinclude :: ../tests/examples/test_howto_log_querying.py
+   :language: python
+
+
+Serving requests in parallel
+----------------------------
+
+*pytest-httpserver*  serves the request in a single-threaded, blocking way. That
+means that if multiple requests are made to it, those will be served one by one.
+
+There can be cases where parallel processing is required, for those cases
+*pytest-httpserver* allows running a server which start one thread per request
+handler, so the requests are served in parallel way (depending on Global
+Interpreter Lock this is not truly parallel, but from the I/O point of view it
+is).
+
+To set this up, you have two possibilities.
+
+
+Overriding httpserver fixture
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+One is to customize how the HTTPServer object is created. This is possible by
+defining the following fixture:
+
+.. code:: python
+
+    @pytest.fixture(scope="session")
+    def make_httpserver() -> Iterable[HTTPServer]:
+        server = HTTPServer(threaded=True)  # set threaded=True to enable thread support
+        server.start()
+        yield server
+        server.clear()
+        if server.is_running():
+            server.stop()
+
+
+This will override the ``httpserver`` fixture in your tests.
+
+Creating a different httpserver fixture
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This way, you can create a different httpserver fixture and you can use it
+besides the main one.
+
+.. code:: python
+
+    @pytest.fixture()
+    def threaded() -> Iterable[HTTPServer]:
+        server = HTTPServer(threaded=True)
+        server.start()
+        yield server
+        server.clear()
+        if server.is_running():
+            server.stop()
+
+
+    def test_threaded(threaded: HTTPServer): ...
+
+
+This will start and stop the server for each tests, which causes about 0.5
+seconds waiting when the server is stopped. It won't override the ``httpserver``
+fixture so you can keep the original single-threaded behavior.
+
+.. warning::
+    Handler threads which are still running when the test is finished, will be
+    left behind and won't be join()ed between the tests. If you want to ensure
+    that all threads are properly cleaned up and you want to wait for them,
+    consider using the second option (:ref:`Creating a different httpserver fixture`)
+    described above.
+
+
+Adding side effects
+-------------------
+
+Sometimes there's a need to add side effects to the handling of the requests.
+Such side effect could be adding some amount of delay to the serving or adding
+some garbage to response data.
+
+While these can be achieved by using
+:py:meth:`pytest_httpserver.RequestHandler.respond_with_handler` where you can
+implement your own function to serve the request, *pytest-httpserver* provides a
+hooks API where you can add side effects to request handlers such as
+:py:meth:`pytest_httpserver.RequestHandler.respond_with_json` and others.
+This allows to use the existing API of registering handlers.
+
+Example:
+
+.. literalinclude :: ../tests/examples/test_howto_hooks.py
+    :language: python
+
+:py:mod:`pytest_httpserver.hooks` module provides some pre-defined hooks to
+use.
+
+You can implement your own hook as well. The requirement is to have a callable
+object (a function) ``Callable[[Request, Response], Response]``. In details:
+
+* Parameter :py:class:`werkzeug.Request` which represents the request
+  sent by the client.
+
+* Parameter :py:class:`werkzeug.Response` which represents the response
+  made by the handler.
+
+* Returns a :py:class:`werkzeug.Response` object which represents the
+  response will be returned to the client.
+
+
+Example:
+
+.. literalinclude :: ../tests/examples/test_howto_custom_hooks.py
+    :language: python
+
+``with_post_hook`` can be called multiple times, in this case *pytest-httpserver*
+will register the hooks, and hooks will be called sequentially, one by one. Each
+hook will receive the response what the previous hook returned, and the last
+hook called will return the final response which will be sent back to the client.

pytest_httpserver-1.0.11/doc/patch.py

@@ -0,0 +1,16 @@
+# this is required to make sphinx able to find references for classes put inside
+# typing.TYPE_CHECKING block
+
+from ssl import SSLContext
+
+from werkzeug import Request
+from werkzeug import Response
+
+import pytest_httpserver.blocking_httpserver
+import pytest_httpserver.httpserver
+
+pytest_httpserver.httpserver.SSLContext = SSLContext
+pytest_httpserver.blocking_httpserver.SSLContext = SSLContext
+
+pytest_httpserver.blocking_httpserver.Request = Request
+pytest_httpserver.blocking_httpserver.Response = Response

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest_httpserver"
-version = "1.0.9"
+version = "1.0.11"
 description = "pytest-httpserver is a httpserver for pytest"
 authors = ["Zsolt Cserna <cserna.zsolt@gmail.com>"]
 license = "MIT"
@@ -38,42 +38,43 @@ pytest_httpserver = "pytest_httpserver.pytest_plugin"
 optional = true
 
 [tool.poetry.group.develop.dependencies]
-pre-commit = "^2.20.0"
-requests = "^2.28.1"
-Sphinx = "^5.1.1"
-sphinx-rtd-theme = "^1.0.0"
-reno = "^3.5.0"
-mypy = "^0.971"
-types-requests = "^2.28.9"
-pytest = "^7.1.3"
-pytest-cov = ">=3,<5"
+pre-commit = ">=2.20,<4.0"
+requests = "*"
+Sphinx = ">=5.1.1,<8.0.0"
+sphinx-rtd-theme = ">=1,<3"
+reno = "*"
+types-requests = "*"
+pytest = ">=7.1.3,<9.0.0"
+pytest-cov = ">=3,<6"
 coverage = ">=6.4.4,<8.0.0"
-types-toml = "^0.10.8"
+types-toml = "*"
 toml = "^0.10.2"
-black = "^23.1.0"
+black = "*"
+ruff = "*"
+mypy = "*"
 
 
 [tool.poetry.group.doc]
 optional = true
 
 [tool.poetry.group.doc.dependencies]
-Sphinx = "^5.1.1"
-sphinx-rtd-theme = "^1.0.0"
+Sphinx = ">=5.1.1,<8.0.0"
+sphinx-rtd-theme = ">=1,<3"
 
 
 [tool.poetry.group.test]
 optional = true
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.1.3"
-pytest-cov = ">=3,<5"
-coverage = ">=6.4.4,<8.0.0"
-requests = "^2.28.1"
-mypy = "^0.971"
-types-requests = "^2.28.9"
-pre-commit = "^2.20.0"
-types-toml = "^0.10.8"
-toml = "^0.10.2"
+pytest = "*"
+pytest-cov = "*"
+coverage = "*"
+requests = "*"
+types-requests = "*"
+pre-commit = "*"
+types-toml = "*"
+toml = "*"
+mypy = "*"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -86,5 +87,57 @@ markers = [
 ]
 
 [tool.mypy]
-files = ["pytest_httpserver", "scripts", "tests", "doc"]
+files = ["pytest_httpserver", "scripts", "tests"]
 implicit_reexport = false
+
+
+[tool.black]
+line-length = 120
+safe = true
+
+[tool.ruff]
+lint.select = ["ALL"]
+lint.ignore = [
+  "I",
+  "D",
+
+  "ANN",
+  "ARG005",
+  "B011",
+  "B904",
+  "C408",
+  "C901",
+  "COM812",
+  "EM101",
+  "EM103",
+  "FBT002",
+  "FIX002",
+  "INP001",
+  "PGH003",
+  "PLR0912",
+  "PLR0913",
+  "PLR2004",
+  "PLW2901",
+  "PT004",
+  "PT012",
+  "PT013",
+  "PTH118",
+  "PTH120",
+  "RET504",
+  "RET505",
+  "RET506",
+  "RUF005",
+  "S101",
+  "S113",
+  "S603",
+  "S607",
+  "SIM108",
+  "T201",
+  "TD002",
+  "TD003",
+  "TRY003",
+  "UP032",
+]
+line-length = 120
+target-version = "py38"
+exclude = ["doc", "example*.py", "tests/examples/*.py"]

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/pytest_httpserver/__init__.py

@@ -2,6 +2,7 @@
 This is package provides the main API for the pytest_httpserver package.
 
 """
+
 __all__ = [
     "HTTPServer",
     "HTTPServerError",
@@ -10,6 +11,7 @@ __all__ = [
     "WaitingSettings",
     "HeaderValueMatcher",
     "RequestHandler",
+    "RequestMatcher",
     "URIPattern",
     "URI_DEFAULT",
     "METHOD_ALL",
@@ -27,5 +29,6 @@ from .httpserver import HTTPServer
 from .httpserver import HTTPServerError
 from .httpserver import NoHandlerError
 from .httpserver import RequestHandler
+from .httpserver import RequestMatcher
 from .httpserver import URIPattern
 from .httpserver import WaitingSettings

{pytest_httpserver-1.0.9 → pytest_httpserver-1.0.11}/pytest_httpserver/blocking_httpserver.py

@@ -1,15 +1,11 @@
+from __future__ import annotations
+
 from queue import Empty
 from queue import Queue
-from ssl import SSLContext
+from typing import TYPE_CHECKING
 from typing import Any
-from typing import Dict
 from typing import Mapping
-from typing import Optional
 from typing import Pattern
-from typing import Union
-
-from werkzeug.wrappers import Request
-from werkzeug.wrappers import Response
 
 from pytest_httpserver.httpserver import METHOD_ALL
 from pytest_httpserver.httpserver import UNDEFINED
@@ -19,6 +15,12 @@ from pytest_httpserver.httpserver import QueryMatcher
 from pytest_httpserver.httpserver import RequestHandlerBase
 from pytest_httpserver.httpserver import URIPattern
 
+if TYPE_CHECKING:
+    from ssl import SSLContext
+
+    from werkzeug import Request
+    from werkzeug import Response
+
 
 class BlockingRequestHandler(RequestHandlerBase):
     """
@@ -59,23 +61,23 @@ class BlockingHTTPServer(HTTPServerBase):
         self,
         host=DEFAULT_LISTEN_HOST,
         port=DEFAULT_LISTEN_PORT,
-        ssl_context: Optional[SSLContext] = None,
+        ssl_context: SSLContext | None = None,
         timeout: int = 30,
     ):
         super().__init__(host, port, ssl_context)
         self.timeout = timeout
         self.request_queue: Queue[Request] = Queue()
-        self.request_handlers: Dict[Request, Queue[BlockingRequestHandler]] = {}
+        self.request_handlers: dict[Request, Queue[BlockingRequestHandler]] = {}
 
     def assert_request(
         self,
-        uri: Union[str, URIPattern, Pattern[str]],
+        uri: str | URIPattern | Pattern[str],
         method: str = METHOD_ALL,
-        data: Union[str, bytes, None] = None,
+        data: str | bytes | None = None,
         data_encoding: str = "utf-8",
-        headers: Optional[Mapping[str, str]] = None,
-        query_string: Union[None, QueryMatcher, str, bytes, Mapping] = None,
-        header_value_matcher: Optional[HeaderValueMatcher] = None,
+        headers: Mapping[str, str] | None = None,
+        query_string: None | QueryMatcher | str | bytes | Mapping = None,
+        header_value_matcher: HeaderValueMatcher | None = None,
         json: Any = UNDEFINED,
         timeout: int = 30,
     ) -> BlockingRequestHandler:
@@ -127,7 +129,7 @@ class BlockingHTTPServer(HTTPServerBase):
         try:
             request = self.request_queue.get(timeout=timeout)
         except Empty:
-            raise AssertionError(f"Waiting for request {matcher} timed out")
+            raise AssertionError(f"Waiting for request {matcher} timed out")  # noqa: EM102
 
         diff = matcher.difference(request)
 
@@ -137,7 +139,7 @@ class BlockingHTTPServer(HTTPServerBase):
 
         if diff:
             request_handler.respond_with_response(self.respond_nohandler(request))
-            raise AssertionError(f"Request {matcher} does not match: {diff}")
+            raise AssertionError(f"Request {matcher} does not match: {diff}")  # noqa: EM102
 
         return request_handler