diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_connection.py | 16 | ||||
| -rw-r--r-- | tests/test_worker_pool.py | 5 |
2 files changed, 14 insertions, 7 deletions
diff --git a/tests/test_connection.py b/tests/test_connection.py index 0b64d2b..5ac76d6 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -1,4 +1,4 @@ -from redis import ConnectionPool, Redis, UnixDomainSocketConnection +from redis import ConnectionPool, Redis, SSLConnection, UnixDomainSocketConnection from rq import Connection, Queue from rq.connections import parse_connection @@ -38,10 +38,14 @@ class TestConnectionInheritance(RQTestCase): self.assertEqual(q2.connection, job2.connection) def test_parse_connection(self): - """Test parsing `ssl` and UnixDomainSocketConnection""" - _, _, kwargs = parse_connection(Redis(ssl=True)) - self.assertTrue(kwargs['ssl']) + """Test parsing the connection""" + conn_class, pool_class, pool_kwargs = parse_connection(Redis(ssl=True)) + self.assertEqual(conn_class, Redis) + self.assertEqual(pool_class, SSLConnection) + path = '/tmp/redis.sock' pool = ConnectionPool(connection_class=UnixDomainSocketConnection, path=path) - _, _, kwargs = parse_connection(Redis(connection_pool=pool)) - self.assertTrue(kwargs['unix_socket_path'], path) + conn_class, pool_class, pool_kwargs = parse_connection(Redis(connection_pool=pool)) + self.assertEqual(conn_class, Redis) + self.assertEqual(pool_class, UnixDomainSocketConnection) + self.assertEqual(pool_kwargs, {"path": path}) diff --git a/tests/test_worker_pool.py b/tests/test_worker_pool.py index c836309..ab2e677 100644 --- a/tests/test_worker_pool.py +++ b/tests/test_worker_pool.py @@ -8,6 +8,7 @@ from rq.job import JobStatus from tests import TestCase from tests.fixtures import CustomJob, _send_shutdown_command, long_running_job, say_hello +from rq.connections import parse_connection from rq.queue import Queue from rq.serializers import JSONSerializer from rq.worker import SimpleWorker @@ -108,8 +109,10 @@ class TestWorkerPool(TestCase): """Ensure run_worker() properly spawns a Worker""" queue = Queue('foo', connection=self.connection) queue.enqueue(say_hello) + + connection_class, pool_class, pool_kwargs = parse_connection(self.connection) run_worker( - 'test-worker', ['foo'], self.connection.__class__, self.connection.connection_pool.connection_kwargs.copy() + 'test-worker', ['foo'], connection_class, pool_class, pool_kwargs ) # Worker should have processed the job self.assertEqual(len(queue), 0) |