diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-04-09 13:44:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 13:44:38 -0400 |
| commit | 0b3112123da5fae4964db784e3bab0c4d83d9d62 (patch) | |
| tree | 8d2766cf654b7fd2b446d15d4bbb8013cce0fd1a /tests/util | |
| parent | Fix duplicate logging of exceptions in transaction processing (#9780) (diff) | |
| download | synapse-0b3112123da5fae4964db784e3bab0c4d83d9d62.tar.xz | |
Use mock from the stdlib. (#9772)
Diffstat (limited to 'tests/util')
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 3 | ||||
| -rw-r--r-- | tests/util/caches/test_ttlcache.py | 2 | ||||
| -rw-r--r-- | tests/util/test_file_consumer.py | 3 | ||||
| -rw-r--r-- | tests/util/test_lrucache.py | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index e434e21aee..2d1f9360e0 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -15,8 +15,7 @@ # limitations under the License. import logging from typing import Set - -import mock +from unittest import mock from twisted.internet import defer, reactor diff --git a/tests/util/caches/test_ttlcache.py b/tests/util/caches/test_ttlcache.py index 816795c136..23018081e5 100644 --- a/tests/util/caches/test_ttlcache.py +++ b/tests/util/caches/test_ttlcache.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from mock import Mock +from unittest.mock import Mock from synapse.util.caches.ttlcache import TTLCache diff --git a/tests/util/test_file_consumer.py b/tests/util/test_file_consumer.py index 2012263184..d1372f6bc2 100644 --- a/tests/util/test_file_consumer.py +++ b/tests/util/test_file_consumer.py @@ -16,8 +16,7 @@ import threading from io import StringIO - -from mock import NonCallableMock +from unittest.mock import NonCallableMock from twisted.internet import defer, reactor diff --git a/tests/util/test_lrucache.py b/tests/util/test_lrucache.py index a739a6aaaf..ce4f1cc30a 100644 --- a/tests/util/test_lrucache.py +++ b/tests/util/test_lrucache.py @@ -14,7 +14,7 @@ # limitations under the License. -from mock import Mock +from unittest.mock import Mock from synapse.util.caches.lrucache import LruCache from synapse.util.caches.treecache import TreeCache |