From 8fbf1b05da9d51ace7fabac6b18ee860b6bc1e60 Mon Sep 17 00:00:00 2001 From: Polina Bungina Date: Mon, 21 Aug 2023 15:27:39 +0200 Subject: [PATCH] Address review --- patroni/ctl.py | 4 +--- tests/test_ctl.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/patroni/ctl.py b/patroni/ctl.py index 6b2d8511..aa567bcd 100644 --- a/patroni/ctl.py +++ b/patroni/ctl.py @@ -46,7 +46,7 @@ try: except ImportError: # pragma: no cover from cdiff import markup_to_pager, PatchStream # pyright: ignore [reportMissingModuleSource] -from .config import get_global_config +from .config import Config, get_global_config from .dcs import get_dcs as _get_dcs, AbstractDCS, Cluster, Member from .exceptions import PatroniException from .postgresql.misc import postgres_version_to_int @@ -226,8 +226,6 @@ def load_config(path: str, dcs_url: Optional[str]) -> Dict[str, Any]: :raises: :class:`PatroniCtlException`: if *path* does not exist or is not readable. """ - from patroni.config import Config - if not (os.path.exists(path) and os.access(path, os.R_OK)): if path != CONFIG_FILE_PATH: # bail if non-default config location specified but file not found / readable raise PatroniCtlException('Provided config file {0} not existing or no read rights.' diff --git a/tests/test_ctl.py b/tests/test_ctl.py index 30fd972a..2a74a2f7 100644 --- a/tests/test_ctl.py +++ b/tests/test_ctl.py @@ -2,7 +2,6 @@ import etcd import mock import os import unittest -import urllib3 from click.testing import CliRunner from datetime import datetime, timedelta @@ -193,7 +192,7 @@ class TestCtl(unittest.TestCase): @patch('patroni.ctl.get_dcs') @patch.object(PoolManager, 'request', Mock(return_value=MockResponse())) - @patch('patroni.ctl.request_patroni', Mock(return_value=urllib3.HTTPResponse())) + @patch('patroni.ctl.request_patroni', Mock(return_value=MockResponse())) def test_failover(self, mock_get_dcs): mock_get_dcs.return_value.set_failover_value = Mock()