pytest_httpserver 1.0.11__tar.gz → 1.1.0__tar.gz

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

@@ -2,6 +2,34 @@
 Release Notes
 =============
 
+.. _Release Notes_1.1.0:
+
+1.1.0
+=====
+
+.. _Release Notes_1.1.0_Bug Fixes:
+
+Bug Fixes
+---------
+
+- Fixed an issue related to the leak of httpserver state between the tests
+  when httpserver is destructed before the other fixtures. `#352 <https://github.com/csernazs/pytest-httpserver/issues/352>`_
+
+
+.. _Release Notes_1.0.12:
+
+1.0.12
+======
+
+.. _Release Notes_1.0.12_Bug Fixes:
+
+Bug Fixes
+---------
+
+- Fix pytest-httpserver's own tests related to log querying. No functional
+  changes in pytest-httpserver code itself. `#345 <https://github.com/csernazs/pytest-httpserver/issues/345>`_
+
+
 .. _Release Notes_1.0.11:
 
 1.0.11

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest_httpserver
-Version: 1.0.11
+Version: 1.1.0
 Summary: pytest-httpserver is a httpserver for pytest
 Home-page: https://github.com/csernazs/pytest-httpserver
 License: MIT

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest_httpserver"
-version = "1.0.11"
+version = "1.1.0"
 description = "pytest-httpserver is a httpserver for pytest"
 authors = ["Zsolt Cserna <cserna.zsolt@gmail.com>"]
 license = "MIT"

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

@@ -64,8 +64,8 @@ def pytest_sessionfinish(session, exitstatus):  # noqa: ARG001
 @pytest.fixture()
 def httpserver(make_httpserver):
     server = make_httpserver
-    yield server
     server.clear()
+    return server
 
 
 @pytest.fixture(scope="session")
@@ -81,8 +81,8 @@ def make_httpserver_ipv4(httpserver_ssl_context):
 @pytest.fixture()
 def httpserver_ipv4(make_httpserver_ipv4):
     server = make_httpserver_ipv4
-    yield server
     server.clear()
+    return server
 
 
 @pytest.fixture(scope="session")
@@ -98,5 +98,5 @@ def make_httpserver_ipv6(httpserver_ssl_context):
 @pytest.fixture()
 def httpserver_ipv6(make_httpserver_ipv6):
     server = make_httpserver_ipv6
-    yield server
     server.clear()
+    return server

pytest_httpserver-1.1.0/tests/test_log_leak.py

@@ -0,0 +1,29 @@
+import pytest
+import requests
+
+from pytest_httpserver import HTTPServer
+
+
+class Client:
+    def __init__(self) -> None:
+        self.url: str | None = None
+
+    def get(self):
+        if self.url:
+            requests.get(self.url)
+
+
+@pytest.fixture()
+def my_fixture():
+    client = Client()
+    yield client
+    client.get()
+
+
+def test_1(my_fixture: Client, httpserver: HTTPServer):
+    httpserver.expect_request("/foo").respond_with_data("OK")
+    my_fixture.url = httpserver.url_for("/foo")
+
+
+def test_2(httpserver: HTTPServer):
+    assert httpserver.log == []

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

@@ -35,39 +35,48 @@ def test_verify(httpserver: HTTPServer):
 def test_verify_assert_msg(httpserver: HTTPServer):
     httpserver.no_handler_status_code = 404
     httpserver.expect_request("/foo", json={"foo": "bar"}, method="POST").respond_with_data("OK")
-    assert requests.get(httpserver.url_for("/foo"), headers={"User-Agent": "requests"}).status_code == 404
+    headers = {"User-Agent": "requests", "Accept-Encoding": "gzip, deflate"}
+    assert requests.get(httpserver.url_for("/foo"), headers=headers).status_code == 404
+
+    expected_lines = [
+        "Matching request found 0 times but expected 1 times.",
+        "Expected request: <RequestMatcher uri='/foo' method='POST' query_string=None headers={} data"
+        "=None json={'foo': 'bar'}>",
+        "Found 1 similar request(s):",
+        "--- Similar Request Start",
+        "Path: /foo",
+        "Method: GET",
+        "Body: b''",
+        f"Headers: Host: localhost:{httpserver.port}",
+        "User-Agent: requests",
+        "Accept-Encoding: gzip, deflate",
+        "Accept: */*",
+        "Connection: keep-alive",
+        "",
+        "",
+        "Query String: ''",
+        "--- Similar Request End",
+    ]
 
     with pytest.raises(AssertionError) as err:
         httpserver.assert_request_made(RequestMatcher("/foo", json={"foo": "bar"}, method="POST"))
 
-    expected_message = f"""Matching request found 0 times but expected 1 times.
-Expected request: <RequestMatcher uri='/foo' method='POST' query_string=None headers={{}} data=None json={{'foo': 'bar'}}>
-Found 1 similar request(s):
---- Similar Request Start
-Path: /foo
-Method: GET
-Body: b''
-Headers: Host: localhost:{httpserver.port}\r
-User-Agent: requests\r
-Accept-Encoding: gzip, deflate\r
-Accept: */*\r
-Connection: keep-alive\r
-\r
-
-Query String: ''
---- Similar Request End
-"""  # noqa: E501
-    assert str(err.value) == expected_message
+    actual_lines = [x.strip() for x in str(err.value).splitlines()][: len(expected_lines)]
+    assert actual_lines == expected_lines
 
 
 def test_verify_assert_msg_no_similar_requests(httpserver: HTTPServer):
     httpserver.expect_request("/foo", json={"foo": "bar"}, method="POST").respond_with_data("OK")
 
+    expected_lines = [
+        "Matching request found 0 times but expected 1 times.",
+        "Expected request: <RequestMatcher uri='/foo' method='POST' query_string=None headers={} data"
+        "=None json={'foo': 'bar'}>",
+        "No similar requests found.",
+    ]
+
     with pytest.raises(AssertionError) as err:
         httpserver.assert_request_made(RequestMatcher("/foo", json={"foo": "bar"}, method="POST"))
 
-    expected_message = """Matching request found 0 times but expected 1 times.
-Expected request: <RequestMatcher uri='/foo' method='POST' query_string=None headers={} data=None json={'foo': 'bar'}>
-No similar requests found.
-"""
-    assert str(err.value) == expected_message
+    actual_lines = [x.strip() for x in str(err.value).splitlines()][: len(expected_lines)]
+    assert actual_lines == expected_lines

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

@@ -212,6 +212,7 @@ def test_sdist_contents(build: Build, version: str):
             "test_hooks.py",
             "test_ip_protocols.py",
             "test_json_matcher.py",
+            "test_log_leak.py",
             "test_log_querying.py",
             "test_mixed.py",
             "test_oneshot.py",