summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy McCurdy <andy@andymccurdy.com>2020-02-01 22:38:37 -0800
committerAndy McCurdy <andy@andymccurdy.com>2020-02-01 22:38:37 -0800
commit1b050753d6ec6a6630c2cfd83c2cfbd741a3ced3 (patch)
tree8eeefe7db936c5e5ed843b6433fa95459c6b6188
parent5a1f3c448063b3e30d3283cd93ef50973abc3806 (diff)
downloadredis-py-1b050753d6ec6a6630c2cfd83c2cfbd741a3ced3.tar.gz
remove Redis and ConnectionPool __eq__ comparison
After further thought this was a bad idea. Just because two connection pools share the same connection arguments does not make them equal. It would seem quite odd if pool_a == pool_b yet pool_a.disconnect() doesn't close all of pool_b's connections. Ref #1240 Fixes #1277 Fixes #1275 Fixes #1267 Fixes #1273
-rwxr-xr-xredis/client.py6
-rwxr-xr-xredis/connection.py6
-rw-r--r--tests/test_client.py27
-rw-r--r--tests/test_connection_pool.py41
4 files changed, 0 insertions, 80 deletions
diff --git a/redis/client.py b/redis/client.py
index 040d131..dde701f 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -746,12 +746,6 @@ class Redis(object):
def __repr__(self):
return "%s<%s>" % (type(self).__name__, repr(self.connection_pool))
- def __eq__(self, other):
- return (
- isinstance(other, self.__class__)
- and self.connection_pool == other.connection_pool
- )
-
def set_response_callback(self, command, callback):
"Set a custom Response Callback"
self.response_callbacks[command] = callback
diff --git a/redis/connection.py b/redis/connection.py
index bf892e9..2323365 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -1100,12 +1100,6 @@ class ConnectionPool(object):
repr(self.connection_class(**self.connection_kwargs)),
)
- def __eq__(self, other):
- return (
- isinstance(other, self.__class__)
- and self.connection_kwargs == other.connection_kwargs
- )
-
def reset(self):
self._lock = threading.RLock()
self._created_connections = 0
diff --git a/tests/test_client.py b/tests/test_client.py
deleted file mode 100644
index e8f79b1..0000000
--- a/tests/test_client.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import redis
-
-
-class TestClient(object):
- def test_client_equality(self):
- r1 = redis.Redis.from_url('redis://localhost:6379/9')
- r2 = redis.Redis.from_url('redis://localhost:6379/9')
- assert r1 == r2
-
- def test_clients_unequal_if_different_types(self):
- r = redis.Redis.from_url('redis://localhost:6379/9')
- assert r != 0
-
- def test_clients_unequal_if_different_hosts(self):
- r1 = redis.Redis.from_url('redis://localhost:6379/9')
- r2 = redis.Redis.from_url('redis://127.0.0.1:6379/9')
- assert r1 != r2
-
- def test_clients_unequal_if_different_ports(self):
- r1 = redis.Redis.from_url('redis://localhost:6379/9')
- r2 = redis.Redis.from_url('redis://localhost:6380/9')
- assert r1 != r2
-
- def test_clients_unequal_if_different_dbs(self):
- r1 = redis.Redis.from_url('redis://localhost:6379/9')
- r2 = redis.Redis.from_url('redis://localhost:6380/10')
- assert r1 != r2
diff --git a/tests/test_connection_pool.py b/tests/test_connection_pool.py
index a862e4e..655e88d 100644
--- a/tests/test_connection_pool.py
+++ b/tests/test_connection_pool.py
@@ -88,47 +88,6 @@ class TestConnectionPool(object):
'path=/abc,db=1,client_name=test-client>>')
assert repr(pool) == expected
- def test_pool_equality(self):
- connection_kwargs = {'host': 'localhost', 'port': 6379, 'db': 1}
- pool1 = self.get_pool(connection_kwargs=connection_kwargs,
- connection_class=redis.Connection)
- pool2 = self.get_pool(connection_kwargs=connection_kwargs,
- connection_class=redis.Connection)
- assert pool1 == pool2
-
- def test_pools_unequal_if_different_types(self):
- connection_kwargs = {'host': 'localhost', 'port': 6379, 'db': 1}
- pool = self.get_pool(connection_kwargs=connection_kwargs,
- connection_class=redis.Connection)
- assert pool != 0
-
- def test_pools_unequal_if_different_hosts(self):
- connection_kwargs1 = {'host': 'localhost', 'port': 6379, 'db': 1}
- connection_kwargs2 = {'host': '127.0.0.1', 'port': 6379, 'db': 1}
- pool1 = self.get_pool(connection_kwargs=connection_kwargs1,
- connection_class=redis.Connection)
- pool2 = self.get_pool(connection_kwargs=connection_kwargs2,
- connection_class=redis.Connection)
- assert pool1 != pool2
-
- def test_pools_unequal_if_different_ports(self):
- connection_kwargs1 = {'host': 'localhost', 'port': 6379, 'db': 1}
- connection_kwargs2 = {'host': 'localhost', 'port': 6380, 'db': 1}
- pool1 = self.get_pool(connection_kwargs=connection_kwargs1,
- connection_class=redis.Connection)
- pool2 = self.get_pool(connection_kwargs=connection_kwargs2,
- connection_class=redis.Connection)
- assert pool1 != pool2
-
- def test_pools_unequal_if_different_dbs(self):
- connection_kwargs1 = {'host': 'localhost', 'port': 6379, 'db': 1}
- connection_kwargs2 = {'host': 'localhost', 'port': 6379, 'db': 2}
- pool1 = self.get_pool(connection_kwargs=connection_kwargs1,
- connection_class=redis.Connection)
- pool2 = self.get_pool(connection_kwargs=connection_kwargs2,
- connection_class=redis.Connection)
- assert pool1 != pool2
-
class TestBlockingConnectionPool(object):
def get_pool(self, connection_kwargs=None, max_connections=10, timeout=20):