summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-08-03 07:35:01 -0400
committersqla-tester <sqla-tester@sqlalchemy.org>2020-08-03 07:35:01 -0400
commit60258ca70267e3c1b63354ce79f4aea386e76afd (patch)
tree417030fec5b6ea6ed71bd1a5b2add94c95b41354 /tests
parent426c24a02e10129d044063e960ee1039a4c55082 (diff)
downloaddogpile-cache-60258ca70267e3c1b63354ce79f4aea386e76afd.tar.gz
Use built-in unittest.mock instead of external mock
Python 3 has a builtin unittest.mock module that is equivalent to the external mock (in fact, the latter has become a backport of the former), so just use it instead of introducing unnecessary dependency. Closes: #186 Pull-request: https://github.com/sqlalchemy/dogpile.cache/pull/186 Pull-request-sha: 5beb8326183807598f568284e428928eed9b34e3 Change-Id: I86e8640b73c4b44c563efa8a80c7b005280aa020
Diffstat (limited to 'tests')
-rw-r--r--tests/cache/plugins/test_mako_cache.py2
-rw-r--r--tests/cache/test_redis_backend.py4
-rw-r--r--tests/cache/test_region.py3
-rw-r--r--tests/test_lock.py3
4 files changed, 5 insertions, 7 deletions
diff --git a/tests/cache/plugins/test_mako_cache.py b/tests/cache/plugins/test_mako_cache.py
index 7bd5080..1837ff3 100644
--- a/tests/cache/plugins/test_mako_cache.py
+++ b/tests/cache/plugins/test_mako_cache.py
@@ -1,8 +1,8 @@
+from unittest import mock
from unittest import TestCase
from mako.cache import register_plugin
from mako.template import Template
-import mock
import pytest
from .. import eq_
diff --git a/tests/cache/test_redis_backend.py b/tests/cache/test_redis_backend.py
index 1070b2a..94780c1 100644
--- a/tests/cache/test_redis_backend.py
+++ b/tests/cache/test_redis_backend.py
@@ -3,9 +3,9 @@ import os
from threading import Event
import time
from unittest import TestCase
+from unittest.mock import Mock
+from unittest.mock import patch
-from mock import Mock
-from mock import patch
import pytest
from dogpile.cache.region import _backend_loader
diff --git a/tests/cache/test_region.py b/tests/cache/test_region.py
index 4272598..d778b52 100644
--- a/tests/cache/test_region.py
+++ b/tests/cache/test_region.py
@@ -4,10 +4,9 @@ import datetime
import io
import itertools
import time
+from unittest import mock
from unittest import TestCase
-import mock
-
from dogpile.cache import CacheRegion
from dogpile.cache import exception
from dogpile.cache import make_region
diff --git a/tests/test_lock.py b/tests/test_lock.py
index dd7f058..4cec3cf 100644
--- a/tests/test_lock.py
+++ b/tests/test_lock.py
@@ -3,10 +3,9 @@ import logging
import math
import threading
import time
+from unittest import mock
from unittest import TestCase
-import mock
-
from dogpile import Lock
from dogpile import NeedRegenerationException
from dogpile.util import ReadWriteMutex