From f2e58414b0684a7d9450aef13d5503d2ebf3c618 Mon Sep 17 00:00:00 2001 From: David Maier <60782329+dmaier-redislabs@users.noreply.github.com> Date: Tue, 25 Jun 2024 13:14:13 +0200 Subject: [PATCH] Fixes CAE-333 (#3290) * Fixes CAE-333, which uncovered that the init method of the base class did override the initialization of the socket_timeout parameter. * Added missing blank lines * Removed blank line * Changed to quotes --------- Co-authored-by: vladvildanov --- redis/connection.py | 2 +- tests/test_connect.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/redis/connection.py b/redis/connection.py index 346ff3aa6b..8645656df3 100644 --- a/redis/connection.py +++ b/redis/connection.py @@ -818,9 +818,9 @@ class UnixDomainSocketConnection(AbstractConnection): "Manages UDS communication to and from a Redis server" def __init__(self, path="", socket_timeout=None, **kwargs): + super().__init__(**kwargs) self.path = path self.socket_timeout = socket_timeout - super().__init__(**kwargs) def repr_pieces(self): pieces = [("path", self.path), ("db", self.db)] diff --git a/tests/test_connect.py b/tests/test_connect.py index fcc1a05268..ec686540fa 100644 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -96,6 +96,23 @@ def test_tcp_ssl_tls12_custom_ciphers(tcp_address, ssl_ciphers): _assert_connect(conn, tcp_address, certfile=certfile, keyfile=keyfile) +""" +Addresses bug CAE-333 which uncovered that the init method of the base +class did override the initialization of the socket_timeout parameter. +""" + + +def test_unix_socket_with_timeout(): + conn = UnixDomainSocketConnection(socket_timeout=1000) + + # Check if the base class defaults were taken over. + assert conn.db == 0 + + # Verify if the timeout and the path is set correctly. + assert conn.socket_timeout == 1000 + assert conn.path == "" + + @pytest.mark.ssl @pytest.mark.skipif(not ssl.HAS_TLSv1_3, reason="requires TLSv1.3") def test_tcp_ssl_version_mismatch(tcp_address):