Add tests for json post requests in http session manager.

Author: fselmo

tests/core/utilities/test_http_session_manager.py

@@ -112,6 +112,28 @@ def test_session_manager_json_make_get_request(mocker, http_session_manager):
     assert adapter._pool_maxsize == DEFAULT_POOLSIZE
 
 
+def test_session_manager_json_make_post_request(mocker, http_session_manager):
+    mocker.patch("requests.Session.post", return_value=MockedResponse())
+
+    # Submit a first request to create a session with default parameters
+    assert len(http_session_manager.session_cache) == 0
+    response = http_session_manager.json_make_post_request(
+        TEST_URI, json={"data": "request"}
+    )
+    assert response == json.dumps({"data": "content"})
+    assert len(http_session_manager.session_cache) == 1
+    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    session = http_session_manager.session_cache.get_cache_entry(cache_key)
+    session.post.assert_called_once_with(TEST_URI, json={"data": "request"}, timeout=30)
+
+    # Ensure the adapter was created with default values
+    check_adapters_mounted(session)
+    adapter = session.get_adapter(TEST_URI)
+    assert isinstance(adapter, HTTPAdapter)
+    assert adapter._pool_connections == DEFAULT_POOLSIZE
+    assert adapter._pool_maxsize == DEFAULT_POOLSIZE
+
+
 def test_session_manager_make_post_request_no_args(mocker, http_session_manager):
     mocker.patch("requests.Session.post", return_value=MockedResponse())
 
@@ -332,6 +354,32 @@ async def test_session_manager_async_json_make_get_request(
     await session.close()
 
 
+@pytest.mark.asyncio
+async def test_session_manager_async_json_make_post_request(
+    mocker, http_session_manager
+):
+    mocker.patch("aiohttp.ClientSession.post", return_value=AsyncMockedResponse())
+
+    # Submit a first request to create a session with default parameters
+    assert len(http_session_manager.session_cache) == 0
+    response = await http_session_manager.async_json_make_post_request(
+        TEST_URI, json={"data": "request"}
+    )
+    assert response == json.dumps({"data": "content"})
+    assert len(http_session_manager.session_cache) == 1
+    cache_key = generate_cache_key(f"{threading.get_ident()}:{TEST_URI}")
+    session = http_session_manager.session_cache.get_cache_entry(cache_key)
+    assert isinstance(session, ClientSession)
+    session.post.assert_called_once_with(
+        TEST_URI,
+        json={"data": "request"},
+        timeout=ClientTimeout(
+            total=30, connect=None, sock_read=None, sock_connect=None
+        ),
+    )
+    await session.close()
+
+
 @pytest.mark.asyncio
 async def test_session_manager_async_make_post_request(mocker, http_session_manager):
     mocker.patch("aiohttp.ClientSession.post", return_value=AsyncMockedResponse())

web3/_utils/http_session_manager.py

@@ -117,21 +117,22 @@ def json_make_get_request(
         response.raise_for_status()
         return response.json()
 
-    def json_make_post_request(
-        self, endpoint_uri: URI, *args: Any, **kwargs: Any
-    ) -> Dict[str, Any]:
-        response = self.get_response_from_post_request(endpoint_uri, *args, **kwargs)
-        response.raise_for_status()
-        return response.json()
-
     def get_response_from_post_request(
         self, endpoint_uri: URI, *args: Any, **kwargs: Any
     ) -> requests.Response:
+        kwargs.setdefault("timeout", DEFAULT_HTTP_TIMEOUT)
         session = self.cache_and_return_session(
             endpoint_uri, request_timeout=kwargs["timeout"]
         )
         return session.post(endpoint_uri, *args, **kwargs)
 
+    def json_make_post_request(
+        self, endpoint_uri: URI, *args: Any, **kwargs: Any
+    ) -> Dict[str, Any]:
+        response = self.get_response_from_post_request(endpoint_uri, *args, **kwargs)
+        response.raise_for_status()
+        return response.json()
+
     def make_post_request(
         self, endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], **kwargs: Any
     ) -> bytes:
@@ -150,8 +151,9 @@ def make_post_request(
             else:
                 return response.content
 
+    @staticmethod
     def _handle_streaming_response(
-        self, response: requests.Response, start: float, timeout: float
+        response: requests.Response, start: float, timeout: float
     ) -> bytes:
         response_body = b""
         for data in response.iter_content():
@@ -296,15 +298,6 @@ async def async_get_response_from_post_request(
         response = await session.post(endpoint_uri, *args, **kwargs)
         return response
 
-    async def async_make_post_request(
-        self, endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], **kwargs: Any
-    ) -> bytes:
-        response = await self.async_get_response_from_post_request(
-            endpoint_uri, data=data, **kwargs
-        )
-        response.raise_for_status()
-        return await response.read()
-
     async def async_json_make_post_request(
         self, endpoint_uri: URI, *args: Any, **kwargs: Any
     ) -> Dict[str, Any]:
@@ -314,6 +307,15 @@ async def async_json_make_post_request(
         response.raise_for_status()
         return await response.json()
 
+    async def async_make_post_request(
+        self, endpoint_uri: URI, data: Union[bytes, Dict[str, Any]], **kwargs: Any
+    ) -> bytes:
+        response = await self.async_get_response_from_post_request(
+            endpoint_uri, data=data, **kwargs
+        )
+        response.raise_for_status()
+        return await response.read()
+
     async def _async_close_evicted_sessions(
         self, timeout: float, evicted_sessions: List[ClientSession]
     ) -> None: