From f317a3d94dbf3860c633e35991a69c39b528ec41 Mon Sep 17 00:00:00 2001 From: Vincent Driessen Date: Sat, 16 Mar 2013 06:52:59 -0700 Subject: [PATCH] Remove test cases for the Unix socket config setting. This is mostly something you would want to test in the redis-py project, not in RQ. The test cases make it a bit complex to read them and they falsely suggest something interesting might be going on in them. --- tests/test_scripts.py | 44 +------------------------------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/tests/test_scripts.py b/tests/test_scripts.py index 3adce81..ae661c7 100644 --- a/tests/test_scripts.py +++ b/tests/test_scripts.py @@ -3,18 +3,7 @@ if is_python_version((2, 7), (3, 2)): from unittest import TestCase else: from unittest2 import TestCase # noqa -from rq.scripts import read_config_file, setup_redis, add_standard_arguments, setup_default_arguments - -class uFaking(object): - def __init__(self, *faking): - for attr in faking: - setattr(self, attr, None) - -def fake_args(): - return uFaking('host', 'port', 'url', 'socket', 'db', 'queues', 'password') - -def conf_pair(**faked_settings): - return faked_settings, fake_args() +from rq.scripts import read_config_file class TestScripts(TestCase): @@ -22,34 +11,3 @@ class TestScripts(TestCase): settings = read_config_file("tests.dummy_settings") self.assertIn("REDIS_HOST", settings) self.assertEqual(settings['REDIS_HOST'], "testhost.example.com") - - def test_socket_from_module(self): - settings, args = conf_pair(REDIS_SOCKET='dummy') - setup_default_arguments(args, settings) - self.assertEqual(args.socket, 'dummy') - - def test_socket_from_args(self): - settings, args = conf_pair(REDIS_SOCKET='sock-read-from-config') - args.socket = 'sock-from-arg' - setup_default_arguments(args, settings) - self.assertEqual(args.socket, 'sock-from-arg') - - def test_add_socket_argument(self): - caught = [] - - args = uFaking() - args.add_argument = lambda *args, **kw: caught.append(args) - - add_standard_arguments(args) - socket_parms = [e for e in caught if e[0] == '--socket'] - self.assertEqual([('--socket', '-s')], socket_parms) - - def test_redis_socket_whiteboxish(self): - args = fake_args() - args.socket = '/no/such/path' - setup_redis(args) - - from rq import connections - conn = connections.pop_connection() - from redis.connection import UnixDomainSocketConnection - self.assertEqual(conn.connection_pool.connection_kwargs['path'], '/no/such/path')