From commits-return-28435-archive-asf-public=cust-asf.ponee.io@airflow.incubator.apache.org Mon Nov 19 16:02:15 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id AB77F180675 for ; Mon, 19 Nov 2018 16:02:14 +0100 (CET) Received: (qmail 88924 invoked by uid 500); 19 Nov 2018 15:02:13 -0000 Mailing-List: contact commits-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list commits@airflow.incubator.apache.org Received: (qmail 88915 invoked by uid 99); 19 Nov 2018 15:02:13 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2018 15:02:13 +0000 From: GitBox To: commits@airflow.apache.org Subject: [GitHub] smentek commented on a change in pull request #4090: [AIRFLOW-3250] Fix for Redis Hook for not authorised connection calls Message-ID: <154263973317.7656.1666221202650576555.gitbox@gitbox.apache.org> Date: Mon, 19 Nov 2018 15:02:13 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit smentek commented on a change in pull request #4090: [AIRFLOW-3250] Fix for Redis Hook for not authorised connection calls URL: https://github.com/apache/incubator-airflow/pull/4090#discussion_r234651267 ########## File path: tests/contrib/hooks/test_redis_hook.py ########## @@ -19,32 +19,116 @@ import unittest -from mock import patch - +from mock import patch, MagicMock from airflow import configuration from airflow.contrib.hooks.redis_hook import RedisHook class TestRedisHook(unittest.TestCase): + def setUp(self): configuration.load_test_config() - def test_get_conn(self): + @patch('airflow.contrib.hooks.redis_hook.StrictRedis') + @patch('airflow.contrib.hooks.redis_hook.RedisHook.get_connection') + def test_get_conn(self, redis_hook_get_connection_mock, StrictRedisMock): + HOST = 'localhost' + PORT = 6379 + PASSWORD = 's3cret!' + DB = 0 + + extra_dejson_mock = MagicMock() + extra_dejson_mock.get.return_value = DB + connection_parameters = MagicMock() + connection_parameters.configure_mock( + host=HOST, + port=PORT, + password=PASSWORD, + extra_dejson=extra_dejson_mock) + redis_hook_get_connection_mock.return_value = connection_parameters + + hook = RedisHook(redis_conn_id='redis_default') + self.assertEqual(hook.redis, None) + + self.assertEqual(hook.host, None, 'host initialised as None.') + self.assertEqual(hook.port, None, 'port initialised as None.') + self.assertEqual(hook.password, None, 'password initialised as None.') + self.assertEqual(hook.db, None, 'db initialised as None.') + + self.assertIs(hook.get_conn(), hook.get_conn(), 'Connection initialized only if None.') + + StrictRedisMock.assert_called_once_with( + host=HOST, + port=PORT, + password=PASSWORD, + db=DB) + + @patch('airflow.contrib.hooks.redis_hook.StrictRedis') + @patch('airflow.contrib.hooks.redis_hook.RedisHook.get_connection') Review comment: Done. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services