diff --git a/lower-constraints.txt b/lower-constraints.txt index 43781ff72..dffdd767a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -16,7 +16,6 @@ iso8601==0.1.11 jsonschema==3.2.0 keystoneauth1==3.4.0 keystonemiddleware==4.17.0 -mock==2.0.0 msgpack==1.0.0 os-api-ref==1.4.0 os-client-config==1.28.0 diff --git a/test-requirements.txt b/test-requirements.txt index 1e606a361..c30ca855a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,6 @@ # Metrics and style hacking>=3.0.1,<3.1.0 # Apache-2.0 -# Packaging -mock>=2.0.0 # BSD - # Backends redis>=3.0.0 # MIT pymongo>=3.6.0 # Apache-2.0 diff --git a/zaqar/tests/unit/notification/test_notifier.py b/zaqar/tests/unit/notification/test_notifier.py index b2ced9656..bb66e718c 100644 --- a/zaqar/tests/unit/notification/test_notifier.py +++ b/zaqar/tests/unit/notification/test_notifier.py @@ -14,10 +14,10 @@ # limitations under the License. import json +from unittest import mock import uuid import ddt -import mock from zaqar.common import urls from zaqar.notification import notifier diff --git a/zaqar/tests/unit/storage/base.py b/zaqar/tests/unit/storage/base.py index dd0c938dc..80e001c7d 100644 --- a/zaqar/tests/unit/storage/base.py +++ b/zaqar/tests/unit/storage/base.py @@ -14,19 +14,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os - import collections import datetime import hashlib import json import math +import os import random import time +from unittest import mock import uuid import ddt -import mock from oslo_utils import timeutils import six import testtools diff --git a/zaqar/tests/unit/storage/sqlalchemy_migration/test_db_manage_cli.py b/zaqar/tests/unit/storage/sqlalchemy_migration/test_db_manage_cli.py index e776f7ed9..7567aac45 100644 --- a/zaqar/tests/unit/storage/sqlalchemy_migration/test_db_manage_cli.py +++ b/zaqar/tests/unit/storage/sqlalchemy_migration/test_db_manage_cli.py @@ -14,8 +14,8 @@ # under the License. import sys +from unittest import mock -import mock import testscenarios import testtools diff --git a/zaqar/tests/unit/storage/test_impl_mongodb.py b/zaqar/tests/unit/storage/test_impl_mongodb.py index 960d6d9e2..7cbbe14fe 100644 --- a/zaqar/tests/unit/storage/test_impl_mongodb.py +++ b/zaqar/tests/unit/storage/test_impl_mongodb.py @@ -16,9 +16,9 @@ import collections import datetime import time +from unittest import mock import uuid -import mock from oslo_utils import timeutils from pymongo import cursor import pymongo.errors diff --git a/zaqar/tests/unit/storage/test_impl_redis.py b/zaqar/tests/unit/storage/test_impl_redis.py index 1837a0d6e..8424bc75d 100644 --- a/zaqar/tests/unit/storage/test_impl_redis.py +++ b/zaqar/tests/unit/storage/test_impl_redis.py @@ -14,9 +14,9 @@ import collections import time +from unittest import mock import uuid -import mock from oslo_utils import timeutils from oslo_utils import uuidutils import redis diff --git a/zaqar/tests/unit/storage/test_pool_catalog_new.py b/zaqar/tests/unit/storage/test_pool_catalog_new.py index 5cee0e384..57249f1a3 100644 --- a/zaqar/tests/unit/storage/test_pool_catalog_new.py +++ b/zaqar/tests/unit/storage/test_pool_catalog_new.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -import mock +from unittest import mock import uuid from zaqar.common import cache as oslo_cache diff --git a/zaqar/tests/unit/storage/test_utils.py b/zaqar/tests/unit/storage/test_utils.py index a25029f38..8e926459c 100644 --- a/zaqar/tests/unit/storage/test_utils.py +++ b/zaqar/tests/unit/storage/test_utils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -import mock +from unittest import mock from zaqar.storage import utils from zaqar import tests as testing diff --git a/zaqar/tests/unit/transport/websocket/test_protocol.py b/zaqar/tests/unit/transport/websocket/test_protocol.py index 412c8386c..a30edbf96 100644 --- a/zaqar/tests/unit/transport/websocket/test_protocol.py +++ b/zaqar/tests/unit/transport/websocket/test_protocol.py @@ -14,11 +14,11 @@ # under the License. import json +from unittest import mock import ddt -import mock - from oslo_utils import uuidutils + import zaqar from zaqar.tests.unit.transport.websocket import base from zaqar.tests.unit.transport.websocket import utils as test_utils diff --git a/zaqar/tests/unit/transport/websocket/v2/test_auth.py b/zaqar/tests/unit/transport/websocket/v2/test_auth.py index b39a3d890..bcc31fd8d 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_auth.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_auth.py @@ -14,12 +14,12 @@ # limitations under the License. import json +from unittest import mock import ddt from keystonemiddleware import auth_token -import mock - from oslo_utils import uuidutils + from zaqar.common import consts from zaqar.common import urls from zaqar.tests.unit.transport.websocket import base diff --git a/zaqar/tests/unit/transport/websocket/v2/test_claims.py b/zaqar/tests/unit/transport/websocket/v2/test_claims.py index 33e53a481..d2473286f 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_claims.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_claims.py @@ -13,9 +13,9 @@ # the License. import json +from unittest import mock import ddt -import mock from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/websocket/v2/test_messages.py b/zaqar/tests/unit/transport/websocket/v2/test_messages.py index 5e517d8a6..e6676e86d 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_messages.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_messages.py @@ -15,9 +15,9 @@ import datetime import json +from unittest import mock import ddt -import mock from oslo_utils import timeutils from oslo_utils import uuidutils import six diff --git a/zaqar/tests/unit/transport/websocket/v2/test_queue_lifecycle.py b/zaqar/tests/unit/transport/websocket/v2/test_queue_lifecycle.py index b3c7dc5ff..c5c1e4bc4 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_queue_lifecycle.py @@ -13,9 +13,9 @@ # the License. import json +from unittest import mock import ddt -import mock from oslo_utils import uuidutils from zaqar.common import consts diff --git a/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py b/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py index a3569f6a3..bd5bb4b12 100644 --- a/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py +++ b/zaqar/tests/unit/transport/websocket/v2/test_subscriptions.py @@ -15,11 +15,11 @@ import json import time +from unittest import mock -import mock import msgpack - from oslo_utils import uuidutils + from zaqar.common import auth from zaqar.common import consts from zaqar.storage import errors as storage_errors diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py index 18cb6b124..0843d843a 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_claims.py @@ -14,10 +14,10 @@ # limitations under the License. import datetime +from unittest import mock import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py index 37b48a6f6..7f59027e8 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_messages.py @@ -14,10 +14,10 @@ # limitations under the License. import datetime +from unittest import mock import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py index 4bd59d4ba..8b4bcbe0a 100644 --- a/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1/test_queue_lifecycle.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations under # the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils import six diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py index 4c096b197..a52fced90 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_claims.py @@ -15,10 +15,10 @@ import datetime import json +from unittest import mock import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py index 51c99d13c..8c562d03c 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_health.py @@ -14,9 +14,10 @@ # limitations under the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from zaqar.storage import errors diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py index 01710d468..af847e36b 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_messages.py @@ -14,11 +14,11 @@ # limitations under the License. import datetime +from unittest import mock import uuid import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils import six diff --git a/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py index 8c0084b72..c72d84178 100644 --- a/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v1_1/test_queue_lifecycle.py @@ -13,9 +13,10 @@ # the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils import six diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py index cb16c62db..0a478b076 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_claims.py @@ -15,10 +15,10 @@ import datetime import json +from unittest import mock import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py index 6716b2dcf..15e0dcb9f 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_health.py @@ -14,9 +14,10 @@ # limitations under the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from zaqar.storage import errors diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py index 298ee106f..659969162 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_messages.py @@ -14,10 +14,10 @@ # limitations under the License. import datetime +from unittest import mock import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import timeutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py index 4648e863c..13a7da162 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_queue_lifecycle.py @@ -13,9 +13,10 @@ # the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils import six diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py index 00b3f3137..f65bbef91 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_subscriptions.py @@ -13,9 +13,10 @@ # the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils diff --git a/zaqar/tests/unit/transport/wsgi/v2_0/test_topic_lifecycle.py b/zaqar/tests/unit/transport/wsgi/v2_0/test_topic_lifecycle.py index 99f0948f3..de4c90c46 100644 --- a/zaqar/tests/unit/transport/wsgi/v2_0/test_topic_lifecycle.py +++ b/zaqar/tests/unit/transport/wsgi/v2_0/test_topic_lifecycle.py @@ -13,9 +13,10 @@ # the License. +from unittest import mock + import ddt import falcon -import mock from oslo_serialization import jsonutils from oslo_utils import uuidutils import six