Fix mock import even more

avandras · avandras · commit 6bdaccb49d6c · 2025-02-12T16:13:19.000+01:00
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -5,7 +5,7 @@
 
 from http.server import HTTPServer
 from io import BytesIO as IO
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from socketserver import ThreadingMixIn
 
 from patroni import global_config
diff --git a/tests/test_async_executor.py b/tests/test_async_executor.py
@@ -1,6 +1,6 @@
 import unittest
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from patroni.async_executor import AsyncExecutor, CriticalTask
 from threading import Thread
 
diff --git a/tests/test_aws.py b/tests/test_aws.py
@@ -3,7 +3,7 @@
 import sys
 import unittest
 
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from collections import namedtuple
 from patroni.scripts.aws import AWSConnection, main as _main
 
diff --git a/tests/test_barman_recover.py b/tests/test_barman_recover.py
@@ -1,6 +1,6 @@
 import logging
 import mock
-from mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 import unittest
 from urllib3.exceptions import MaxRetryError
 
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 
 from patroni.async_executor import CriticalTask
 from patroni.postgresql import Postgresql
diff --git a/tests/test_callback_executor.py b/tests/test_callback_executor.py
@@ -1,7 +1,7 @@
 import psutil
 import unittest
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from patroni.postgresql.callback_executor import CallbackExecutor
 
 
diff --git a/tests/test_cancellable.py b/tests/test_cancellable.py
@@ -1,7 +1,7 @@
 import psutil
 import unittest
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from patroni.exceptions import PostgresException
 from patroni.postgresql.cancellable import CancellableSubprocess
 
diff --git a/tests/test_citus.py b/tests/test_citus.py
@@ -1,5 +1,5 @@
 import time
-from mock import Mock, patch, PropertyMock
+from unittest.mock import Mock, patch, PropertyMock
 from patroni.postgresql.mpp.citus import CitusHandler
 from patroni.psycopg import ProgrammingError
 
diff --git a/tests/test_config.py b/tests/test_config.py
@@ -4,7 +4,7 @@
 import io
 
 from copy import deepcopy
-from mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from patroni import global_config
 from patroni.config import ClusterConfig, Config, ConfigParseError
diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py
@@ -5,7 +5,7 @@
 
 from . import MockConnect, MockCursor, MockConnectionInfo
 from copy import deepcopy
-from mock import MagicMock, Mock, PropertyMock, mock_open as _mock_open, patch
+from unittest.mock import MagicMock, Mock, PropertyMock, mock_open as _mock_open, patch
 
 from patroni.__main__ import main as _main
 from patroni.config import Config
diff --git a/tests/test_consul.py b/tests/test_consul.py
@@ -2,7 +2,7 @@
 import unittest
 
 from consul import ConsulException, NotFound
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.consul import AbstractDCS, Cluster, Consul, ConsulInternalError, \
     ConsulError, ConsulClient, HTTPClient, InvalidSessionTTL, InvalidSession, RetryFailedError
diff --git a/tests/test_ctl.py b/tests/test_ctl.py
@@ -6,7 +6,7 @@
 
 from click.testing import CliRunner
 from datetime import datetime, timedelta
-from mock import patch, Mock, PropertyMock
+from unittest.mock import patch, Mock, PropertyMock
 from patroni import global_config
 from patroni.ctl import ctl, load_config, output_members, get_dcs, parse_dcs, \
     get_all_members, get_any_member, get_cursor, query_member, PatroniCtlException, apply_config_changes, \
diff --git a/tests/test_etcd.py b/tests/test_etcd.py
@@ -4,7 +4,7 @@
 import unittest
 
 from dns.exception import DNSException
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.etcd import AbstractDCS, EtcdClient, Cluster, Etcd, EtcdError, DnsCachingResolver
 from patroni.exceptions import DCSError
diff --git a/tests/test_etcd3.py b/tests/test_etcd3.py
@@ -3,7 +3,7 @@
 import unittest
 import urllib3
 
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.etcd import DnsCachingResolver
 from patroni.dcs.etcd3 import PatroniEtcd3Client, Cluster, Etcd3, Etcd3Client, \
diff --git a/tests/test_exhibitor.py b/tests/test_exhibitor.py
@@ -1,7 +1,7 @@
 import unittest
 import urllib3
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.exhibitor import ExhibitorEnsembleProvider, Exhibitor
 from patroni.dcs.zookeeper import ZooKeeperError
diff --git a/tests/test_file_perm.py b/tests/test_file_perm.py
@@ -1,7 +1,7 @@
 import unittest
 import stat
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from patroni.file_perm import pg_perm
 
diff --git a/tests/test_ha.py b/tests/test_ha.py
@@ -3,7 +3,7 @@
 import os
 import sys
 
-from mock import Mock, MagicMock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, MagicMock, PropertyMock, patch, mock_open
 from patroni import global_config
 from patroni.collections import CaseInsensitiveSet
 from patroni.config import Config
diff --git a/tests/test_kubernetes.py b/tests/test_kubernetes.py
@@ -7,7 +7,7 @@
 import unittest
 import urllib3
 
-from mock import Mock, PropertyMock, mock_open, patch
+from unittest.mock import Mock, PropertyMock, mock_open, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.kubernetes import Cluster, k8s_client, k8s_config, K8sConfig, K8sConnectionFailed, \
     K8sException, K8sObject, Kubernetes, KubernetesError, KubernetesRetriableException, \
diff --git a/tests/test_log.py b/tests/test_log.py
@@ -5,7 +5,7 @@
 import yaml
 from io import StringIO
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from patroni.config import Config
 from patroni.log import PatroniLogger
 from queue import Queue, Full
diff --git a/tests/test_patroni.py b/tests/test_patroni.py
@@ -7,7 +7,7 @@
 
 import patroni.config as config
 from http.server import HTTPServer
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.api import RestApiServer
 from patroni.async_executor import AsyncExecutor
 from patroni.dcs import Cluster, Member
diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py
@@ -6,7 +6,7 @@
 import time
 
 from copy import deepcopy
-from mock import Mock, MagicMock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, MagicMock, PropertyMock, patch, mock_open
 
 import patroni.psycopg as psycopg
 
diff --git a/tests/test_postmaster.py b/tests/test_postmaster.py
@@ -2,7 +2,7 @@
 import psutil
 import unittest
 
-from mock import Mock, patch, mock_open
+from unittest.mock import Mock, patch, mock_open
 from patroni.postgresql.postmaster import PostmasterProcess
 
 
diff --git a/tests/test_raft.py b/tests/test_raft.py
@@ -3,7 +3,7 @@
 import tempfile
 import time
 
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.raft import Cluster, DynMemberSyncObj, KVStoreTTL, \
     Raft, RaftError, SyncObjUtility, TCPTransport, _TCPTransport
diff --git a/tests/test_raft_controller.py b/tests/test_raft_controller.py
@@ -2,7 +2,7 @@
 import os
 import unittest
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from pysyncobj import SyncObj
 from patroni.config import Config
 from patroni.raft_controller import RaftController, main as _main
diff --git a/tests/test_rewind.py b/tests/test_rewind.py
@@ -1,4 +1,4 @@
-from mock import Mock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, PropertyMock, patch, mock_open
 
 from patroni.postgresql import Postgresql
 from patroni.postgresql.cancellable import CancellableSubprocess
diff --git a/tests/test_slots.py b/tests/test_slots.py
@@ -3,7 +3,7 @@
 import unittest
 
 
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from threading import Thread
 
 from patroni import global_config, psycopg
diff --git a/tests/test_sync.py b/tests/test_sync.py
@@ -1,6 +1,6 @@
 import os
 
-from mock import Mock, patch, PropertyMock
+from unittest.mock import Mock, patch, PropertyMock
 
 from patroni import global_config
 from patroni.collections import CaseInsensitiveSet
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,6 +1,6 @@
 import unittest
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from patroni.exceptions import PatroniException
 from patroni.utils import Retry, RetryFailedError, enable_keepalive, polling_loop, validate_directory, unquote
diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -5,7 +5,7 @@
 import unittest
 
 from io import StringIO
-from mock import Mock, patch, mock_open
+from unittest.mock import Mock, patch, mock_open
 from patroni.dcs import dcs_modules
 from patroni.validator import schema, Directory, Schema
 
diff --git a/tests/test_wale_restore.py b/tests/test_wale_restore.py
@@ -3,7 +3,7 @@
 
 import patroni.psycopg as psycopg
 
-from mock import Mock, PropertyMock, patch, mock_open
+from unittest.mock import Mock, PropertyMock, patch, mock_open
 from patroni.scripts import wale_restore
 from patroni.scripts.wale_restore import WALERestore, main as _main, get_major_version
 from threading import current_thread
diff --git a/tests/test_watchdog.py b/tests/test_watchdog.py
@@ -4,7 +4,7 @@
 import unittest
 import os
 
-from mock import patch, Mock, PropertyMock
+from unittest.mock import patch, Mock, PropertyMock
 from patroni.watchdog import Watchdog, WatchdogError
 from patroni.watchdog.base import NullWatchdog
 from patroni.watchdog.linux import LinuxWatchdogDevice
diff --git a/tests/test_zookeeper.py b/tests/test_zookeeper.py
@@ -6,7 +6,7 @@
 from kazoo.handlers.threading import SequentialThreadingHandler
 from kazoo.protocol.states import KeeperState, WatchedEvent, ZnodeStat
 from kazoo.retry import RetryFailedError
-from mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, PropertyMock, patch
 from patroni.dcs import get_dcs
 from patroni.dcs.zookeeper import Cluster, PatroniKazooClient, \
     PatroniSequentialThreadingHandler, ZooKeeper, ZooKeeperError
