Use unittest.mock instead of case

44 files changed, 64 insertions, 45 deletions

diff --git a/t/unit/asynchronous/aws/sqs/test_connection.py b/t/unit/asynchronous/aws/sqs/test_connection.py
index 07c76475..abb63ef2 100644
--- a/t/unit/asynchronous/aws/sqs/test_connection.py
+++ b/t/unit/asynchronous/aws/sqs/test_connection.py
@@ -1,4 +1,4 @@
-from case import Mock, MagicMock
+from unittest.mock import Mock, MagicMock
 
 from kombu.asynchronous.aws.sqs.connection import (
     AsyncSQSConnection
diff --git a/t/unit/asynchronous/aws/sqs/test_queue.py b/t/unit/asynchronous/aws/sqs/test_queue.py
index 08b16ef7..e4ad1c6a 100644
--- a/t/unit/asynchronous/aws/sqs/test_queue.py
+++ b/t/unit/asynchronous/aws/sqs/test_queue.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu.asynchronous.aws.sqs.message import AsyncMessage
 from kombu.asynchronous.aws.sqs.queue import AsyncQueue
diff --git a/t/unit/asynchronous/aws/test_aws.py b/t/unit/asynchronous/aws/test_aws.py
index 09d731fa..93d92e4b 100644
--- a/t/unit/asynchronous/aws/test_aws.py
+++ b/t/unit/asynchronous/aws/test_aws.py
@@ -1,4 +1,4 @@
-from case import Mock
+from unittest.mock import Mock
 
 from kombu.asynchronous.aws import connect_sqs
 
diff --git a/t/unit/asynchronous/aws/test_connection.py b/t/unit/asynchronous/aws/test_connection.py
index d297653d..78cbe522 100644
--- a/t/unit/asynchronous/aws/test_connection.py
+++ b/t/unit/asynchronous/aws/test_connection.py
@@ -4,7 +4,7 @@ import pytest
 
 from contextlib import contextmanager
 
-from case import Mock
+from unittest.mock import Mock
 from vine.abstract import Thenable
 
 from kombu.exceptions import HttpError
diff --git a/t/unit/asynchronous/http/test_curl.py b/t/unit/asynchronous/http/test_curl.py
index 7aff9a6e..01a57325 100644
--- a/t/unit/asynchronous/http/test_curl.py
+++ b/t/unit/asynchronous/http/test_curl.py
@@ -1,6 +1,7 @@
 import pytest
 
-from case import Mock, call, patch, skip
+from unittest.mock import Mock, call, patch
+from case import skip
 
 from kombu.asynchronous.http.curl import READ, WRITE, CurlClient
 
diff --git a/t/unit/asynchronous/http/test_http.py b/t/unit/asynchronous/http/test_http.py
index 39d559e0..35b302a0 100644
--- a/t/unit/asynchronous/http/test_http.py
+++ b/t/unit/asynchronous/http/test_http.py
@@ -4,7 +4,8 @@ from io import BytesIO
 
 from vine import promise
 
-from case import Mock, skip
+from unittest.mock import Mock
+from case import skip
 
 from kombu.asynchronous import http
 from kombu.asynchronous.http.base import BaseClient, normalize_header
diff --git a/t/unit/asynchronous/test_hub.py b/t/unit/asynchronous/test_hub.py
index 659fafca..31f21124 100644
--- a/t/unit/asynchronous/test_hub.py
+++ b/t/unit/asynchronous/test_hub.py
@@ -1,7 +1,7 @@
 import errno
 import pytest
 
-from case import Mock, call, patch
+from unittest.mock import Mock, call, patch
 from vine import promise
 
 from kombu.asynchronous import hub as _hub
diff --git a/t/unit/asynchronous/test_timer.py b/t/unit/asynchronous/test_timer.py
index 78263c15..a521d368 100644
--- a/t/unit/asynchronous/test_timer.py
+++ b/t/unit/asynchronous/test_timer.py
@@ -2,7 +2,7 @@ import pytest
 
 from datetime import datetime
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu.asynchronous.timer import Entry, Timer, to_timestamp
 
diff --git a/t/unit/test_clocks.py b/t/unit/test_clocks.py
index a31aea32..c8d52bec 100644
--- a/t/unit/test_clocks.py
+++ b/t/unit/test_clocks.py
@@ -3,7 +3,7 @@ import pickle
 from heapq import heappush
 from time import time
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu.clocks import LamportClock, timetuple
 
diff --git a/t/unit/test_common.py b/t/unit/test_common.py
index b7584a7d..4f560b67 100644
--- a/t/unit/test_common.py
+++ b/t/unit/test_common.py
@@ -2,7 +2,8 @@ import pytest
 import socket
 
 from amqp import RecoverableConnectionError
-from case import ContextMock, Mock, patch
+from unittest.mock import Mock, patch
+from case import ContextMock
 
 from kombu import common
 from kombu.common import (
diff --git a/t/unit/test_compat.py b/t/unit/test_compat.py
index 26d55138..a4ff98b2 100644
--- a/t/unit/test_compat.py
+++ b/t/unit/test_compat.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu import Connection, Exchange, Queue
 from kombu import compat
diff --git a/t/unit/test_connection.py b/t/unit/test_connection.py
index a47b2c0d..1e3c7706 100644
--- a/t/unit/test_connection.py
+++ b/t/unit/test_connection.py
@@ -4,7 +4,8 @@ import socket
 
 from copy import copy, deepcopy
 
-from case import Mock, patch, skip
+from unittest.mock import Mock, patch
+from case import skip
 
 from kombu import Connection, Consumer, Producer, parse_url
 from kombu.connection import Resource
diff --git a/t/unit/test_entity.py b/t/unit/test_entity.py
index 494f3124..3ba36bef 100644
--- a/t/unit/test_entity.py
+++ b/t/unit/test_entity.py
@@ -1,7 +1,7 @@
 import pickle
 import pytest
 
-from case import Mock, call
+from unittest.mock import Mock, call
 
 from kombu import Connection, Exchange, Producer, Queue, binding
 from kombu.abstract import MaybeChannelBound
diff --git a/t/unit/test_exceptions.py b/t/unit/test_exceptions.py
index d7002d2f..bba72a83 100644
--- a/t/unit/test_exceptions.py
+++ b/t/unit/test_exceptions.py
@@ -1,4 +1,4 @@
-from case import Mock
+from unittest.mock import Mock
 
 from kombu.exceptions import HttpError
 
diff --git a/t/unit/test_log.py b/t/unit/test_log.py
index 5da579d3..bd3cb636 100644
--- a/t/unit/test_log.py
+++ b/t/unit/test_log.py
@@ -1,7 +1,7 @@
 import logging
 import sys
 
-from case import ANY, Mock, patch
+from unittest.mock import ANY, Mock, patch
 
 from kombu.log import (
     get_logger,
diff --git a/t/unit/test_message.py b/t/unit/test_message.py
index 067f15f5..a0be3a46 100644
--- a/t/unit/test_message.py
+++ b/t/unit/test_message.py
@@ -1,7 +1,7 @@
 import pytest
 import sys
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu.message import Message
 
diff --git a/t/unit/test_messaging.py b/t/unit/test_messaging.py
index ed8e9a82..52c09ad3 100644
--- a/t/unit/test_messaging.py
+++ b/t/unit/test_messaging.py
@@ -4,7 +4,7 @@ import sys
 
 from collections import defaultdict
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu import Connection, Consumer, Producer, Exchange, Queue
 from kombu.exceptions import MessageStateError
diff --git a/t/unit/test_mixins.py b/t/unit/test_mixins.py
index a781ca86..12647bf1 100644
--- a/t/unit/test_mixins.py
+++ b/t/unit/test_mixins.py
@@ -1,7 +1,8 @@
 import pytest
 import socket
 
-from case import ContextMock, Mock, patch
+from unittest.mock import Mock, patch
+from case import ContextMock
 
 from kombu.mixins import ConsumerMixin
 
diff --git a/t/unit/test_pidbox.py b/t/unit/test_pidbox.py
index f10842e6..5b14ffff 100644
--- a/t/unit/test_pidbox.py
+++ b/t/unit/test_pidbox.py
@@ -2,7 +2,7 @@ import pytest
 import socket
 import warnings
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu import Connection
 from kombu import pidbox
diff --git a/t/unit/test_pools.py b/t/unit/test_pools.py
index c6e03440..2857914e 100644
--- a/t/unit/test_pools.py
+++ b/t/unit/test_pools.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu import Connection, Producer
 from kombu import pools
diff --git a/t/unit/test_serialization.py b/t/unit/test_serialization.py
index 1442a9f4..4fd8a9c4 100644
--- a/t/unit/test_serialization.py
+++ b/t/unit/test_serialization.py
@@ -5,7 +5,8 @@ import sys
 
 from base64 import b64decode
 
-from case import call, mock, patch, skip
+from unittest.mock import call, patch
+from case import mock, skip
 
 from kombu.exceptions import ContentDisallowed, EncodeError, DecodeError
 from kombu.serialization import (
diff --git a/t/unit/test_simple.py b/t/unit/test_simple.py
index c86ea73c..1f9cc8e2 100644
--- a/t/unit/test_simple.py
+++ b/t/unit/test_simple.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu import Connection, Exchange, Queue
 
diff --git a/t/unit/transport/test_SQS.py b/t/unit/transport/test_SQS.py
index bc763641..a8546e2e 100644
--- a/t/unit/transport/test_SQS.py
+++ b/t/unit/transport/test_SQS.py
@@ -13,8 +13,9 @@ import string
 from queue import Empty
 
 from botocore.exceptions import ClientError
-from case import Mock, skip
-from case.mock import patch
+from unittest.mock import Mock, patch
+from case import skip
+
 
 from kombu import messaging
 from kombu import Connection, Exchange, Queue
diff --git a/t/unit/transport/test_azureservicebus.py b/t/unit/transport/test_azureservicebus.py
index 045f3ea6..64bed507 100644
--- a/t/unit/transport/test_azureservicebus.py
+++ b/t/unit/transport/test_azureservicebus.py
@@ -1,7 +1,8 @@
 import pytest
 from queue import Empty
 
-from case import skip, patch
+from unittest.mock import patch
+from case import skip
 from kombu import messaging
 from kombu import Connection, Exchange, Queue
 from kombu.transport import azureservicebus
diff --git a/t/unit/transport/test_base.py b/t/unit/transport/test_base.py
index 94d9b551..e122b1e2 100644
--- a/t/unit/transport/test_base.py
+++ b/t/unit/transport/test_base.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu import Connection, Consumer, Exchange, Producer, Queue
 from kombu.message import Message
diff --git a/t/unit/transport/test_consul.py b/t/unit/transport/test_consul.py
index cd3a8916..53938758 100644
--- a/t/unit/transport/test_consul.py
+++ b/t/unit/transport/test_consul.py
@@ -1,7 +1,8 @@
 import pytest
 from queue import Empty
 
-from case import Mock, skip
+from unittest.mock import Mock
+from case import skip
 
 from kombu.transport.consul import Channel, Transport
 
diff --git a/t/unit/transport/test_etcd.py b/t/unit/transport/test_etcd.py
index 59815e5f..fdb8d20d 100644
--- a/t/unit/transport/test_etcd.py
+++ b/t/unit/transport/test_etcd.py
@@ -1,7 +1,8 @@
 import pytest
 from queue import Empty
 
-from case import Mock, patch, skip
+from unittest.mock import Mock, patch
+from case import skip
 
 from kombu.transport.etcd import Channel, Transport
 
diff --git a/t/unit/transport/test_librabbitmq.py b/t/unit/transport/test_librabbitmq.py
index ca140eb4..f9f755fc 100644
--- a/t/unit/transport/test_librabbitmq.py
+++ b/t/unit/transport/test_librabbitmq.py
@@ -1,6 +1,7 @@
 import pytest
 
-from case import Mock, patch, skip
+from unittest.mock import Mock, patch
+from case import skip
 
 try:
     import librabbitmq
diff --git a/t/unit/transport/test_mongodb.py b/t/unit/transport/test_mongodb.py
index fe7dc03c..827dbe55 100644
--- a/t/unit/transport/test_mongodb.py
+++ b/t/unit/transport/test_mongodb.py
@@ -2,7 +2,8 @@ import datetime
 import pytest
 from queue import Empty
 
-from case import MagicMock, call, patch, skip
+from unittest.mock import MagicMock, call, patch
+from case import skip
 
 from kombu import Connection
 
diff --git a/t/unit/transport/test_pyamqp.py b/t/unit/transport/test_pyamqp.py
index 124eb0fa..3ca9a83f 100644
--- a/t/unit/transport/test_pyamqp.py
+++ b/t/unit/transport/test_pyamqp.py
@@ -2,7 +2,8 @@ import sys
 
 from itertools import count
 
-from case import Mock, mock, patch
+from unittest.mock import Mock, patch
+from case import mock
 
 from kombu import Connection
 from kombu.transport import pyamqp
diff --git a/t/unit/transport/test_qpid.py b/t/unit/transport/test_qpid.py
index 2200731f..1c985e89 100644
--- a/t/unit/transport/test_qpid.py
+++ b/t/unit/transport/test_qpid.py
@@ -13,7 +13,8 @@ from collections.abc import Callable
 
 from itertools import count
 
-from case import Mock, call, patch, skip
+from unittest.mock import Mock, call, patch
+from case import skip
 
 from kombu.transport.qpid import (AuthenticationFailure, Channel, Connection,
                                   ConnectionError, Message, NotFound, QoS,
diff --git a/t/unit/transport/test_redis.py b/t/unit/transport/test_redis.py
index 91443ff7..22c8cc8a 100644
--- a/t/unit/transport/test_redis.py
+++ b/t/unit/transport/test_redis.py
@@ -5,7 +5,8 @@ import types
 from collections import defaultdict
 from itertools import count
 from queue import Empty, Queue as _Queue
-from case import ANY, ContextMock, Mock, call, mock, skip, patch
+from unittest.mock import ANY, Mock, call, patch
+from case import ContextMock, mock, skip
 
 from kombu import Connection, Exchange, Queue, Consumer, Producer
 from kombu.exceptions import InconsistencyError, VersionMismatch
diff --git a/t/unit/transport/test_sqlalchemy.py b/t/unit/transport/test_sqlalchemy.py
index a6f8aa8f..41730911 100644
--- a/t/unit/transport/test_sqlalchemy.py
+++ b/t/unit/transport/test_sqlalchemy.py
@@ -1,5 +1,6 @@
 import pytest
-from case import patch, skip
+from unittest.mock import patch
+from case import skip
 
 from kombu import Connection
 
diff --git a/t/unit/transport/test_transport.py b/t/unit/transport/test_transport.py
index a13d7bf4..ca84dd80 100644
--- a/t/unit/transport/test_transport.py
+++ b/t/unit/transport/test_transport.py
@@ -1,4 +1,4 @@
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu import transport
 
diff --git a/t/unit/transport/virtual/test_base.py b/t/unit/transport/virtual/test_base.py
index 9eb26f38..08ae0a84 100644
--- a/t/unit/transport/virtual/test_base.py
+++ b/t/unit/transport/virtual/test_base.py
@@ -4,7 +4,7 @@ import warnings
 import socket
 from time import monotonic
 
-from case import MagicMock, Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 from kombu import Connection
 from kombu.compression import compress
diff --git a/t/unit/transport/virtual/test_exchange.py b/t/unit/transport/virtual/test_exchange.py
index 736d03e8..8ae2bb5a 100644
--- a/t/unit/transport/virtual/test_exchange.py
+++ b/t/unit/transport/virtual/test_exchange.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu import Connection
 from kombu.transport.virtual import exchange
diff --git a/t/unit/utils/test_amq_manager.py b/t/unit/utils/test_amq_manager.py
index 5e08cd78..663e922e 100644
--- a/t/unit/utils/test_amq_manager.py
+++ b/t/unit/utils/test_amq_manager.py
@@ -1,6 +1,7 @@
 import pytest
 
-from case import mock, patch
+from unittest.mock import patch
+from case import mock
 
 from kombu import Connection
 
diff --git a/t/unit/utils/test_compat.py b/t/unit/utils/test_compat.py
index d307c9e2..ce0c0cc8 100644
--- a/t/unit/utils/test_compat.py
+++ b/t/unit/utils/test_compat.py
@@ -2,7 +2,8 @@ import socket
 import sys
 import types
 
-from case import Mock, mock, patch
+from unittest.mock import Mock, patch
+from case import mock
 
 from kombu.utils import compat
 from kombu.utils.compat import entrypoints, maybe_fileno
diff --git a/t/unit/utils/test_debug.py b/t/unit/utils/test_debug.py
index 2439f449..ca3cad8c 100644
--- a/t/unit/utils/test_debug.py
+++ b/t/unit/utils/test_debug.py
@@ -1,6 +1,6 @@
 import logging
 
-from case import Mock, patch
+from unittest.mock import Mock, patch
 
 from kombu.utils.debug import Logwrapped, setup_logging
 
diff --git a/t/unit/utils/test_encoding.py b/t/unit/utils/test_encoding.py
index 3eedbb24..cf50c746 100644
--- a/t/unit/utils/test_encoding.py
+++ b/t/unit/utils/test_encoding.py
@@ -2,7 +2,7 @@ import sys
 
 from contextlib import contextmanager
 
-from case import patch
+from unittest.mock import patch
 
 from kombu.utils.encoding import (
     get_default_encoding_file, safe_str,
diff --git a/t/unit/utils/test_functional.py b/t/unit/utils/test_functional.py
index ab3852db..162c16d9 100644
--- a/t/unit/utils/test_functional.py
+++ b/t/unit/utils/test_functional.py
@@ -4,7 +4,8 @@ import pytest
 
 from itertools import count
 
-from case import Mock, mock
+from unittest.mock import Mock
+from case import mock
 
 from kombu.utils import functional as utils
 from kombu.utils.functional import (
diff --git a/t/unit/utils/test_imports.py b/t/unit/utils/test_imports.py
index 79f66dc9..5dc95b75 100644
--- a/t/unit/utils/test_imports.py
+++ b/t/unit/utils/test_imports.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu import Exchange
 from kombu.utils.imports import symbol_by_name
diff --git a/t/unit/utils/test_json.py b/t/unit/utils/test_json.py
index 82de6ba4..372ba517 100644
--- a/t/unit/utils/test_json.py
+++ b/t/unit/utils/test_json.py
@@ -5,7 +5,7 @@ from datetime import datetime
 from decimal import Decimal
 from uuid import uuid4
 
-from case import MagicMock, Mock
+from unittest.mock import MagicMock, Mock
 
 from kombu.utils.encoding import str_to_bytes
 from kombu.utils.json import _DecodeError, dumps, loads
diff --git a/t/unit/utils/test_scheduling.py b/t/unit/utils/test_scheduling.py
index 52186935..43bb7014 100644
--- a/t/unit/utils/test_scheduling.py
+++ b/t/unit/utils/test_scheduling.py
@@ -1,6 +1,6 @@
 import pytest
 
-from case import Mock
+from unittest.mock import Mock
 
 from kombu.utils.scheduling import FairCycle, cycle_by_name