diff --git a/requirements.txt b/requirements.txt index 1f185a41..d0adfc8c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,4 @@ oslo.log>=3.36.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 -osc-lib>=1.8.0 # Apache-2.0 +osc-lib>=2.1.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 879bf767..8f379901 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0 # Unit testing fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD testtools>=2.2.0 # MIT # Test runner diff --git a/tests/unit/auth/test_keystone.py b/tests/unit/auth/test_keystone.py index bd76a54e..2a208d1d 100644 --- a/tests/unit/auth/test_keystone.py +++ b/tests/unit/auth/test_keystone.py @@ -14,7 +14,7 @@ # limitations under the License. -import mock +from unittest import mock from keystoneauth1 import session diff --git a/tests/unit/cli/fakes.py b/tests/unit/cli/fakes.py index 73931b96..d6ed5bdc 100644 --- a/tests/unit/cli/fakes.py +++ b/tests/unit/cli/fakes.py @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from osc_lib.tests import utils diff --git a/tests/unit/common/test_http.py b/tests/unit/common/test_http.py index 86833361..9a62e7c1 100644 --- a/tests/unit/common/test_http.py +++ b/tests/unit/common/test_http.py @@ -15,7 +15,7 @@ import json -import mock +from unittest import mock from zaqarclient.common import http from zaqarclient.tests import base diff --git a/tests/unit/queues/v1/test_client.py b/tests/unit/queues/v1/test_client.py index 3bcb5f7f..604c7af2 100644 --- a/tests/unit/queues/v1/test_client.py +++ b/tests/unit/queues/v1/test_client.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import ddt diff --git a/tests/unit/queues/v1/test_core.py b/tests/unit/queues/v1/test_core.py index 0abe2567..feae62c1 100644 --- a/tests/unit/queues/v1/test_core.py +++ b/tests/unit/queues/v1/test_core.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.queues.v1 import core from zaqarclient.tests import base diff --git a/tests/unit/queues/v1/test_message.py b/tests/unit/queues/v1/test_message.py index 5a9bbc34..9d54818d 100644 --- a/tests/unit/queues/v1/test_message.py +++ b/tests/unit/queues/v1/test_message.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.queues.v1 import iterator as iterate from zaqarclient.queues.v1 import message diff --git a/tests/unit/queues/v2/test_client.py b/tests/unit/queues/v2/test_client.py index 2c597496..152f990a 100644 --- a/tests/unit/queues/v2/test_client.py +++ b/tests/unit/queues/v2/test_client.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import ddt diff --git a/tests/unit/queues/v2/test_message.py b/tests/unit/queues/v2/test_message.py index fc22d40b..d7725708 100644 --- a/tests/unit/queues/v2/test_message.py +++ b/tests/unit/queues/v2/test_message.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.queues.v1 import iterator as iterate from zaqarclient.queues.v2 import message diff --git a/tests/unit/transport/test_http.py b/tests/unit/transport/test_http.py index 218344c4..cd079c94 100644 --- a/tests/unit/transport/test_http.py +++ b/tests/unit/transport/test_http.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import requests as prequest from requests.packages.urllib3 import response diff --git a/tests/unit/transport/test_ws.py b/tests/unit/transport/test_ws.py index aad30de5..3b61ef28 100644 --- a/tests/unit/transport/test_ws.py +++ b/tests/unit/transport/test_ws.py @@ -11,7 +11,7 @@ # under the License. import json -import mock +from unittest import mock from zaqarclient.tests import base from zaqarclient.transport import request diff --git a/zaqarclient/tests/queues/base.py b/zaqarclient/tests/queues/base.py index dfea7e1e..08a0d9f4 100644 --- a/zaqarclient/tests/queues/base.py +++ b/zaqarclient/tests/queues/base.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import netutils from zaqarclient.queues import client diff --git a/zaqarclient/tests/queues/claims.py b/zaqarclient/tests/queues/claims.py index 744ec319..a25aba59 100644 --- a/zaqarclient/tests/queues/claims.py +++ b/zaqarclient/tests/queues/claims.py @@ -14,8 +14,8 @@ # limitations under the License. import json -import mock import time +from unittest import mock from zaqarclient.queues.v1 import claim from zaqarclient.tests.queues import base diff --git a/zaqarclient/tests/queues/flavor.py b/zaqarclient/tests/queues/flavor.py index ac8050ef..35abf6a9 100644 --- a/zaqarclient/tests/queues/flavor.py +++ b/zaqarclient/tests/queues/flavor.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.queues.v1 import iterator from zaqarclient.tests.queues import base diff --git a/zaqarclient/tests/queues/health.py b/zaqarclient/tests/queues/health.py index fa812433..47765fb9 100644 --- a/zaqarclient/tests/queues/health.py +++ b/zaqarclient/tests/queues/health.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.tests.queues import base from zaqarclient.transport import response diff --git a/zaqarclient/tests/queues/messages.py b/zaqarclient/tests/queues/messages.py index eb4d686d..eadddf24 100644 --- a/zaqarclient/tests/queues/messages.py +++ b/zaqarclient/tests/queues/messages.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.tests.queues import base from zaqarclient.transport import response diff --git a/zaqarclient/tests/queues/pool.py b/zaqarclient/tests/queues/pool.py index e37d1eda..bc6094d8 100644 --- a/zaqarclient/tests/queues/pool.py +++ b/zaqarclient/tests/queues/pool.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.queues.v1 import iterator from zaqarclient.tests.queues import base diff --git a/zaqarclient/tests/queues/queues.py b/zaqarclient/tests/queues/queues.py index 572e33fd..15b52f84 100644 --- a/zaqarclient/tests/queues/queues.py +++ b/zaqarclient/tests/queues/queues.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient import errors from zaqarclient.queues import client diff --git a/zaqarclient/tests/queues/subscriptions.py b/zaqarclient/tests/queues/subscriptions.py index 4ddc91eb..ecea0d7e 100644 --- a/zaqarclient/tests/queues/subscriptions.py +++ b/zaqarclient/tests/queues/subscriptions.py @@ -14,7 +14,7 @@ # limitations under the License. import json -import mock +from unittest import mock from zaqarclient.tests.queues import base from zaqarclient.transport import errors