pytest_httpserver 1.0.11__tar.gz → 1.0.12__tar.gz

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

@@ -2,6 +2,20 @@
 Release Notes
 =============
 
+.. _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.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest_httpserver
-Version: 1.0.11
+Version: 1.0.12
 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.0.12}/doc/conf.py

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest_httpserver"
-version = "1.0.11"
+version = "1.0.12"
 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.0.12}/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