diff --git a/heatclient/tests/unit/osc/utils.py b/heatclient/tests/unit/osc/utils.py index e2ed52ee..3ef07a59 100644 --- a/heatclient/tests/unit/osc/utils.py +++ b/heatclient/tests/unit/osc/utils.py @@ -15,10 +15,10 @@ # import os +import sys +from unittest import mock import fixtures -import mock -import sys import testtools from heatclient.tests.unit.osc import fakes diff --git a/heatclient/tests/unit/osc/v1/fakes.py b/heatclient/tests/unit/osc/v1/fakes.py index 87525bb0..dec0c6aa 100644 --- a/heatclient/tests/unit/osc/v1/fakes.py +++ b/heatclient/tests/unit/osc/v1/fakes.py @@ -13,7 +13,7 @@ # under the License. # -import mock +from unittest import mock from heatclient.tests.unit.osc import utils diff --git a/heatclient/tests/unit/osc/v1/test_build_info.py b/heatclient/tests/unit/osc/v1/test_build_info.py index c17a42f0..40893d21 100644 --- a/heatclient/tests/unit/osc/v1/test_build_info.py +++ b/heatclient/tests/unit/osc/v1/test_build_info.py @@ -11,7 +11,7 @@ # under the License. # -import mock +from unittest import mock from heatclient.osc.v1 import build_info as osc_build_info from heatclient.tests.unit.osc.v1 import fakes as orchestration_fakes diff --git a/heatclient/tests/unit/osc/v1/test_event.py b/heatclient/tests/unit/osc/v1/test_event.py index d7ecb600..5edaf202 100644 --- a/heatclient/tests/unit/osc/v1/test_event.py +++ b/heatclient/tests/unit/osc/v1/test_event.py @@ -13,8 +13,8 @@ # Copyright 2015 IBM Corp. import copy +from unittest import mock -import mock import testscenarios from heatclient import exc diff --git a/heatclient/tests/unit/osc/v1/test_resource.py b/heatclient/tests/unit/osc/v1/test_resource.py index 817638c8..b932f7e8 100644 --- a/heatclient/tests/unit/osc/v1/test_resource.py +++ b/heatclient/tests/unit/osc/v1/test_resource.py @@ -12,8 +12,8 @@ # import copy +from unittest import mock -import mock from osc_lib import exceptions as exc from heatclient import exc as heat_exc diff --git a/heatclient/tests/unit/osc/v1/test_snapshot.py b/heatclient/tests/unit/osc/v1/test_snapshot.py index 7f69c610..1b999421 100644 --- a/heatclient/tests/unit/osc/v1/test_snapshot.py +++ b/heatclient/tests/unit/osc/v1/test_snapshot.py @@ -9,8 +9,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# -import mock + +from unittest import mock + from osc_lib import exceptions as exc import six diff --git a/heatclient/tests/unit/osc/v1/test_software_config.py b/heatclient/tests/unit/osc/v1/test_software_config.py index 685a0a98..470de123 100644 --- a/heatclient/tests/unit/osc/v1/test_software_config.py +++ b/heatclient/tests/unit/osc/v1/test_software_config.py @@ -11,7 +11,8 @@ # under the License. # -import mock +from unittest import mock + from osc_lib import exceptions as exc import yaml diff --git a/heatclient/tests/unit/osc/v1/test_software_deployment.py b/heatclient/tests/unit/osc/v1/test_software_deployment.py index 96ec84cd..9edb6a9c 100644 --- a/heatclient/tests/unit/osc/v1/test_software_deployment.py +++ b/heatclient/tests/unit/osc/v1/test_software_deployment.py @@ -12,8 +12,8 @@ # import copy +from unittest import mock -import mock from osc_lib import exceptions as exc from heatclient import exc as heat_exc diff --git a/heatclient/tests/unit/osc/v1/test_stack.py b/heatclient/tests/unit/osc/v1/test_stack.py index d6a51b09..7af48ff3 100644 --- a/heatclient/tests/unit/osc/v1/test_stack.py +++ b/heatclient/tests/unit/osc/v1/test_stack.py @@ -13,8 +13,8 @@ import copy import io +from unittest import mock -import mock from osc_lib import exceptions as exc from osc_lib import utils import six diff --git a/heatclient/tests/unit/osc/v1/test_stack_failures.py b/heatclient/tests/unit/osc/v1/test_stack_failures.py index 1ecfbf59..9cb56503 100644 --- a/heatclient/tests/unit/osc/v1/test_stack_failures.py +++ b/heatclient/tests/unit/osc/v1/test_stack_failures.py @@ -14,7 +14,7 @@ import collections -import mock +from unittest import mock from heatclient import exc from heatclient.osc.v1 import stack_failures diff --git a/heatclient/tests/unit/osc/v1/test_template.py b/heatclient/tests/unit/osc/v1/test_template.py index 3a85c99b..0694510a 100644 --- a/heatclient/tests/unit/osc/v1/test_template.py +++ b/heatclient/tests/unit/osc/v1/test_template.py @@ -12,7 +12,7 @@ # # Copyright 2015 IBM Corp. -import mock +from unittest import mock from heatclient import exc from heatclient.osc.v1 import template diff --git a/heatclient/tests/unit/test_build_info.py b/heatclient/tests/unit/test_build_info.py index bc08f3bb..99330e0a 100644 --- a/heatclient/tests/unit/test_build_info.py +++ b/heatclient/tests/unit/test_build_info.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_serialization import jsonutils import testtools diff --git a/heatclient/tests/unit/test_common_http.py b/heatclient/tests/unit/test_common_http.py index 17afa38b..1d32ba14 100644 --- a/heatclient/tests/unit/test_common_http.py +++ b/heatclient/tests/unit/test_common_http.py @@ -13,9 +13,9 @@ # limitations under the License. import socket +from unittest import mock from keystoneauth1 import adapter -import mock from oslo_serialization import jsonutils import six import testtools diff --git a/heatclient/tests/unit/test_deployment_utils.py b/heatclient/tests/unit/test_deployment_utils.py index 1167a769..4a5dc13f 100644 --- a/heatclient/tests/unit/test_deployment_utils.py +++ b/heatclient/tests/unit/test_deployment_utils.py @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six import swiftclient.client import testscenarios diff --git a/heatclient/tests/unit/test_environment_format.py b/heatclient/tests/unit/test_environment_format.py index 905c9107..e2a86a8f 100644 --- a/heatclient/tests/unit/test_environment_format.py +++ b/heatclient/tests/unit/test_environment_format.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six import testscenarios import testtools diff --git a/heatclient/tests/unit/test_event_utils.py b/heatclient/tests/unit/test_event_utils.py index b080e000..bcc8dbae 100644 --- a/heatclient/tests/unit/test_event_utils.py +++ b/heatclient/tests/unit/test_event_utils.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import event_utils diff --git a/heatclient/tests/unit/test_events.py b/heatclient/tests/unit/test_events.py index b63aebe3..ebae3273 100644 --- a/heatclient/tests/unit/test_events.py +++ b/heatclient/tests/unit/test_events.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_resource_types.py b/heatclient/tests/unit/test_resource_types.py index e31af8e7..92d1c497 100644 --- a/heatclient/tests/unit/test_resource_types.py +++ b/heatclient/tests/unit/test_resource_types.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_resources.py b/heatclient/tests/unit/test_resources.py index 8676b8ca..65285e9c 100644 --- a/heatclient/tests/unit/test_resources.py +++ b/heatclient/tests/unit/test_resources.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from six.moves.urllib import parse import testtools diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index 0c8b272b..c29a3a20 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -14,11 +14,11 @@ import os import sys import tempfile +from unittest import mock import uuid import fixtures from keystoneauth1 import fixture as keystone_fixture -import mock from oslo_serialization import jsonutils from oslo_utils import encodeutils from requests_mock.contrib import fixture as rm_fixture diff --git a/heatclient/tests/unit/test_software_configs.py b/heatclient/tests/unit/test_software_configs.py index 5adcad61..e55bb400 100644 --- a/heatclient/tests/unit/test_software_configs.py +++ b/heatclient/tests/unit/test_software_configs.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_software_deployments.py b/heatclient/tests/unit/test_software_deployments.py index 47a446da..046fb2cc 100644 --- a/heatclient/tests/unit/test_software_deployments.py +++ b/heatclient/tests/unit/test_software_deployments.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_stacks.py b/heatclient/tests/unit/test_stacks.py index 443015a6..d1c6a1c9 100644 --- a/heatclient/tests/unit/test_stacks.py +++ b/heatclient/tests/unit/test_stacks.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testscenarios from testscenarios import scenarios as scnrs import testtools diff --git a/heatclient/tests/unit/test_template_format.py b/heatclient/tests/unit/test_template_format.py index ffc1ec4f..ab2aa1a7 100644 --- a/heatclient/tests/unit/test_template_format.py +++ b/heatclient/tests/unit/test_template_format.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six import testscenarios import testtools diff --git a/heatclient/tests/unit/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py index 082283a6..a13d7aed 100644 --- a/heatclient/tests/unit/test_template_utils.py +++ b/heatclient/tests/unit/test_template_utils.py @@ -13,8 +13,8 @@ import json import tempfile +from unittest import mock -import mock from oslo_serialization import base64 import six from six.moves.urllib import error diff --git a/heatclient/tests/unit/test_utils.py b/heatclient/tests/unit/test_utils.py index 0cb1462d..9c01f49b 100644 --- a/heatclient/tests/unit/test_utils.py +++ b/heatclient/tests/unit/test_utils.py @@ -14,8 +14,8 @@ # under the License. import os +from unittest import mock -import mock import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/v1/test_hooks.py b/heatclient/tests/unit/v1/test_hooks.py index 65abc033..90cef7c4 100644 --- a/heatclient/tests/unit/v1/test_hooks.py +++ b/heatclient/tests/unit/v1/test_hooks.py @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import testtools from heatclient.common import hook_utils diff --git a/lower-constraints.txt b/lower-constraints.txt index e1897e34..927c3970 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -31,7 +31,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==0.6 msgpack-python==0.4.0 munch==2.1.0 diff --git a/test-requirements.txt b/test-requirements.txt index 6173b050..b1bb5f22 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD requests-mock>=1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD python-openstackclient>=3.12.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0