summaryrefslogtreecommitdiff
path: root/tests/test_connection_pool.py
diff options
context:
space:
mode:
authorTim Savage <tim.savage@poweredbypenguins.org>2016-03-29 18:15:34 +1100
committerTim Savage <tim.savage@poweredbypenguins.org>2016-03-29 18:15:34 +1100
commit8e6f655d069fd3b31de63ae7f9ef967a7bf6de14 (patch)
tree14510ac419a08d6ee2e966592498027e381e32d8 /tests/test_connection_pool.py
parentb40875d553ab6d6db69e64eef134e5fac652b033 (diff)
downloadredis-py-8e6f655d069fd3b31de63ae7f9ef967a7bf6de14.tar.gz
Extend ConnectionPool.to_url to parse querystring arguments to correct type.
Previously if a value for socket_timeout was supplied as part fo the URL an error would be raised when a socket was created with an invalid type, this change fixes that by parsing `socket_timeout`, `socket_connect_timeout` to float values. In addition the boolean values `socket_keepalive` and `retry_on_timeout` are parsed to bool types taking into account the usage of True/False, Yes/No strings.
Diffstat (limited to 'tests/test_connection_pool.py')
-rw-r--r--tests/test_connection_pool.py39
1 files changed, 38 insertions, 1 deletions
diff --git a/tests/test_connection_pool.py b/tests/test_connection_pool.py
index 6b2478a..c36177f 100644
--- a/tests/test_connection_pool.py
+++ b/tests/test_connection_pool.py
@@ -6,7 +6,7 @@ import time
import re
from threading import Thread
-from redis.connection import ssl_available
+from redis.connection import ssl_available, to_bool
from .conftest import skip_if_server_version_lt
@@ -237,6 +237,43 @@ class TestConnectionPoolURLParsing(object):
'password': None,
}
+ def test_extra_typed_querystring_options(self):
+ pool = redis.ConnectionPool.from_url(
+ 'redis://localhost/2?socket_timeout=20&socket_connect_timeout=10&socket_keepalive=&retry_on_timeout=Yes')
+
+ assert pool.connection_class == redis.Connection
+ assert pool.connection_kwargs == {
+ 'host': 'localhost',
+ 'port': 6379,
+ 'db': 2,
+ 'socket_timeout': 20.0,
+ 'socket_connect_timeout': 10.0,
+ 'retry_on_timeout': True,
+ 'password': None,
+ }
+
+ def test_boolean_parsing(self):
+ for expected, value in (
+ (None, None),
+ (None, ''),
+ (False, 0), (False, '0'),
+ (False, 'f'), (False, 'F'), (False, 'False'),
+ (False, 'n'), (False, 'N'), (False, 'No'),
+ (True, 1), (True, '1'),
+ (True, 'y'), (True, 'Y'), (True, 'Yes'),
+ ):
+ assert expected is to_bool(value)
+
+ def test_invalid_extra_typed_querystring_options(self):
+ import warnings
+ with warnings.catch_warnings(record=True) as warning_log:
+ redis.ConnectionPool.from_url('redis://localhost/2?socket_timeout=_&socket_connect_timeout=abc')
+ # Compare the message values
+ assert [str(m.message) for m in sorted(warning_log, key=lambda l: str(l.message))] == [
+ 'Invalid value for `socket_connect_timeout` in connection URL.',
+ 'Invalid value for `socket_timeout` in connection URL.',
+ ]
+
def test_extra_querystring_options(self):
pool = redis.ConnectionPool.from_url('redis://localhost?a=1&b=2')
assert pool.connection_class == redis.Connection