diff --git a/opensearchpy/transport.py b/opensearchpy/transport.py index 3ea0301c..3ffd097c 100644 --- a/opensearchpy/transport.py +++ b/opensearchpy/transport.py @@ -455,6 +455,8 @@ class Transport(object): timeout = None if params: timeout = params.pop("request_timeout", None) + if not timeout: + timeout = params.pop("timeout", None) ignore = params.pop("ignore", ()) if isinstance(ignore, int): ignore = (ignore,) diff --git a/test_opensearchpy/test_async/test_transport.py b/test_opensearchpy/test_async/test_transport.py index 1d463dc3..b5634a8d 100644 --- a/test_opensearchpy/test_async/test_transport.py +++ b/test_opensearchpy/test_async/test_transport.py @@ -140,6 +140,18 @@ class TestTransport: "headers": None, } == t.get_connection().calls[0][1] + async def test_timeout_extracted_from_params_and_passed(self): + t = AsyncTransport([{}], connection_class=DummyConnection) + + await t.perform_request("GET", "/", params={"timeout": 84}) + assert 1 == len(t.get_connection().calls) + assert ("GET", "/", {}, None) == t.get_connection().calls[0][0] + assert { + "timeout": 84, + "ignore": (), + "headers": None, + } == t.get_connection().calls[0][1] + async def test_opaque_id(self): t = AsyncTransport([{}], opaque_id="app-1", connection_class=DummyConnection) diff --git a/test_opensearchpy/test_transport.py b/test_opensearchpy/test_transport.py index 4effb611..067b5d09 100644 --- a/test_opensearchpy/test_transport.py +++ b/test_opensearchpy/test_transport.py @@ -142,6 +142,17 @@ class TestTransport(TestCase): t.get_connection().calls[0][1], ) + def test_timeout_extracted_from_params_and_passed(self): + t = Transport([{}], connection_class=DummyConnection) + + t.perform_request("GET", "/", params={"timeout": 84}) + self.assertEqual(1, len(t.get_connection().calls)) + self.assertEqual(("GET", "/", {}, None), t.get_connection().calls[0][0]) + self.assertEqual( + {"timeout": 84, "ignore": (), "headers": None}, + t.get_connection().calls[0][1], + ) + def test_opaque_id(self): t = Transport([{}], opaque_id="app-1", connection_class=DummyConnection)