Use unittest.mock instead of third party mock

Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib.

Change-Id: I8f764e9ba46a4e2055be61eb0fe97d155ab1c70e
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

contrib/heat_docker/heat_docker/tests/fake_docker_client.py

@@ -14,9 +14,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import random
 import string
+from unittest import mock
 
 
 class APIError(Exception):

contrib/heat_docker/heat_docker/tests/test_docker_container.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import exception
 from heat.common.i18n import _

heat/tests/api/aws/test_api_ec2token.py

@@ -13,7 +13,7 @@
 
 
 import json
-import mock
+from unittest import mock
 
 from oslo_config import cfg
 from oslo_utils import importutils

heat/tests/api/cfn/test_api_cfn_v1.py

@@ -13,8 +13,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 from oslo_config import fixture as config_fixture
 
 from heat.api.aws import exception

heat/tests/api/openstack_v1/test_actions.py

@@ -12,8 +12,13 @@
 #    under the License.
 
 import json
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 import webob.exc
 
 import heat.api.middleware.fault as fault

heat/tests/api/openstack_v1/test_build_info.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 import heat.api.middleware.fault as fault
 import heat.api.openstack.v1.build_info as build_info

heat/tests/api/openstack_v1/test_events.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 import webob.exc
 
 import heat.api.middleware.fault as fault

heat/tests/api/openstack_v1/test_resources.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 import webob.exc
 
 import heat.api.middleware.fault as fault

heat/tests/api/openstack_v1/test_services.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_messaging import exceptions
 import webob.exc
 

heat/tests/api/openstack_v1/test_software_configs.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 import webob.exc
 
 import heat.api.middleware.fault as fault

heat/tests/api/openstack_v1/test_software_deployments.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 import webob.exc
 
 import heat.api.middleware.fault as fault

heat/tests/api/openstack_v1/test_stacks.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 import webob.exc
 

heat/tests/api/openstack_v1/test_util.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from webob import exc
 
 from heat.api.openstack.v1 import util

heat/tests/api/openstack_v1/test_views_common.py

@@ -11,8 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
 from urllib import parse as urlparse
+=======
+from unittest import mock
+
+from six.moves.urllib import parse as urlparse
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.api.openstack.v1.views import views_common
 from heat.tests import common

heat/tests/api/openstack_v1/test_views_stacks_view.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.api.openstack.v1.views import stacks_view
 from heat.common import identifier

heat/tests/api/openstack_v1/tools.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_log import log
 from oslo_messaging._drivers import common as rpc_common

heat/tests/api/test_wsgi.py

@@ -15,14 +15,19 @@
 #    under the License.
 
 
+from unittest import mock
+
 import fixtures
 import json
+<<<<<<< HEAD
 import mock
+=======
+from oslo_config import cfg
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 import socket
 import webob
 
-from oslo_config import cfg
-
 from heat.api.aws import exception as aws_exception
 from heat.common import exception
 from heat.common import wsgi

heat/tests/autoscaling/test_heat_scaling_group.py

@@ -12,8 +12,8 @@
 
 import datetime
 import json
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 
 from heat.common import exception

heat/tests/autoscaling/test_heat_scaling_policy.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/autoscaling/test_launch_config.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import short_id

heat/tests/autoscaling/test_lbutils.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/autoscaling/test_scaling_group.py

@@ -13,8 +13,8 @@
 
 import datetime
 import json
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 
 from heat.common import exception

heat/tests/autoscaling/test_scaling_policy.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/aws/test_eip.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from neutronclient.common import exceptions as q_exceptions
 from neutronclient.v2_0 import client as neutronclient
 

heat/tests/aws/test_instance.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import copy
+from unittest import mock
 import uuid
 
-import mock
 from neutronclient.v2_0 import client as neutronclient
 
 from heat.common import exception

heat/tests/aws/test_loadbalancer.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/aws/test_s3.py

@@ -11,9 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from oslo_config import cfg
+import six
 import swiftclient.client as sc
 
 from heat.common import exception

heat/tests/aws/test_security_group.py

@@ -13,8 +13,8 @@
 
 import collections
 import copy
+from unittest import mock
 
-import mock
 from neutronclient.common import exceptions as neutron_exc
 from neutronclient.v2_0 import client as neutronclient
 

heat/tests/aws/test_user.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/aws/test_volume.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
 from cinderclient import exceptions as cinder_exp
-import mock
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/aws/test_waitcondition.py

@@ -14,9 +14,9 @@
 import copy
 import datetime
 import json
+from unittest import mock
 import uuid
 
-import mock
 from oslo_utils import timeutils
 from urllib import parse
 

heat/tests/clients/test_barbican_client.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import collections
+from unittest import mock
 
 from barbicanclient import exceptions
-import mock
 
 from heat.common import exception
 from heat.engine.clients.os import barbican

heat/tests/clients/test_blazar_client.py

@@ -11,9 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from heat.tests import common
 from heat.tests import utils
-import mock
 
 
 class BlazarClientPluginTest(common.HeatTestCase):

heat/tests/clients/test_cinder_client.py

@@ -12,11 +12,11 @@
 #    under the License.
 """Tests for :module:'heat.engine.clients.os.cinder'."""
 
+from unittest import mock
 import uuid
 
 from cinderclient import exceptions as cinder_exc
 from keystoneauth1 import exceptions as ks_exceptions
-import mock
 
 from heat.common import exception
 from heat.engine.clients.os import cinder

heat/tests/clients/test_clients.py

@@ -11,6 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from aodhclient import exceptions as aodh_exc
 from cinderclient import exceptions as cinder_exc
 from glanceclient import exc as glance_exc
@@ -20,7 +22,6 @@ from keystoneauth1 import exceptions as keystone_exc
 from keystoneauth1.identity import generic
 from manilaclient import exceptions as manila_exc
 from mistralclient.api import base as mistral_base
-import mock
 from neutronclient.common import exceptions as neutron_exc
 from openstack import exceptions
 from oslo_config import cfg

heat/tests/clients/test_designate_client.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from designateclient import client as designate_client
-import mock
 
 from heat.common import exception as heat_exception
 from heat.engine.clients.os import designate as client

heat/tests/clients/test_glance_client.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
 from glanceclient import exc
-import mock
 
 from heat.engine.clients import client_exception as exception
 from heat.engine.clients.os import glance

heat/tests/clients/test_heat_client.py

@@ -12,7 +12,7 @@
 #    under the License.
 
 import json
-import mock
+from unittest import mock
 import uuid
 
 from keystoneauth1 import access as ks_access

heat/tests/clients/test_ironic_client.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from ironicclient import exceptions as ic_exc
-import mock
 
 from heat.engine.clients.os import ironic as ic
 from heat.tests import common

heat/tests/clients/test_keystone_client.py

@@ -11,8 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from keystoneauth1 import exceptions as keystone_exceptions
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.engine.clients.os import keystone

heat/tests/clients/test_magnum_client.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from magnumclient import exceptions as mc_exc
-import mock
 
 from heat.engine.clients.os import magnum as mc
 from heat.tests import common

heat/tests/clients/test_manila_client.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import collections
+from unittest import mock
 
 from manilaclient import exceptions
-import mock
 
 from heat.common import exception as heat_exception
 from heat.tests import common

heat/tests/clients/test_mistral_client.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from mistralclient.auth import keystone
-import mock
 
 from heat.common import exception
 from heat.engine.clients.os import mistral

heat/tests/clients/test_monasca_client.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception as heat_exception
 from heat.engine.clients.os import monasca as client_plugin

heat/tests/clients/test_neutron_client.py

@@ -11,7 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 from neutronclient.common import exceptions as qe
 
 from heat.common import exception

heat/tests/clients/test_nova_client.py

@@ -13,9 +13,9 @@
 """Tests for :module:'heat.engine.clients.os.nova'."""
 
 import collections
+from unittest import mock
 import uuid
 
-import mock
 from novaclient import client as nc
 from novaclient import exceptions as nova_exceptions
 from oslo_config import cfg

heat/tests/clients/test_sahara_client.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
-import mock
 from saharaclient.api import base as sahara_base
 
 from heat.common import exception

heat/tests/clients/test_sdk_client.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from openstack import exceptions
 

heat/tests/clients/test_senlin_client.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from openstack import exceptions
 
 from heat.engine.clients.os import senlin as senlin_plugin

heat/tests/clients/test_swift_client.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytz
 from testtools import matchers
 

heat/tests/clients/test_zaqar_client.py

@@ -11,10 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.engine.clients.os import zaqar
-
 from heat.tests import common
 from heat.tests import utils
 

heat/tests/clients/test_zun_client.py

@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.tests import common
 from heat.tests import utils

heat/tests/constraints/test_common_constraints.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.engine.constraint import common_constraints as cc
 from heat.tests import common

heat/tests/convergence/framework/worker_wrapper.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.engine import worker
 from heat.tests.convergence.framework import message_processor

heat/tests/db/test_sqlalchemy_api.py

@@ -13,20 +13,19 @@
 
 import copy
 import datetime
-import fixtures
 import json
 import logging
 import time
+from unittest import mock
 import uuid
 
-import mock
+import fixtures
 from oslo_config import cfg
 from oslo_db import exception as db_exception
 from oslo_utils import timeutils
 from sqlalchemy.orm import exc
 from sqlalchemy.orm import session
 
-
 from heat.common import context
 from heat.common import exception
 from heat.common import short_id

heat/tests/db/test_sqlalchemy_filters.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.db.sqlalchemy import filters as db_filters
 from heat.tests import common

heat/tests/engine/service/test_service_engine.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_config import cfg
 from oslo_utils import timeutils
 

heat/tests/engine/service/test_software_config.py

@@ -12,9 +12,9 @@
 #    under the License.
 
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 from oslo_messaging.rpc import dispatcher
 from oslo_serialization import jsonutils as json
 from oslo_utils import timeutils

heat/tests/engine/service/test_stack_action.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_messaging.rpc import dispatcher
 
 from heat.common import exception

heat/tests/engine/service/test_stack_adopt.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher
 

heat/tests/engine/service/test_stack_create.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher
 from oslo_service import threadgroup

heat/tests/engine/service/test_stack_delete.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher
 from oslo_utils import timeutils

heat/tests/engine/service/test_stack_events.py

@@ -11,7 +11,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging import conffixture
 

heat/tests/engine/service/test_stack_resources.py

@@ -10,7 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import cfg
 from oslo_messaging.rpc import dispatcher
 

heat/tests/engine/service/test_stack_snapshot.py

@@ -10,9 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from unittest import mock
 import uuid
 
-import mock
 from oslo_messaging.rpc import dispatcher
 
 from heat.common import exception

heat/tests/engine/service/test_stack_update.py

@@ -10,10 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
 import eventlet.queue
-import mock
 from oslo_config import cfg
 from oslo_messaging import conffixture
 from oslo_messaging.rpc import dispatcher

heat/tests/engine/service/test_threadgroup_mgr.py

@@ -11,9 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import eventlet
-import mock
+from unittest import mock
 
+import eventlet
 from oslo_context import context
 
 from heat.engine import service

heat/tests/engine/test_check_resource.py

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import eventlet
-import mock
+from unittest import mock
 import uuid
 
+import eventlet
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/engine/test_engine_worker.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
 
 from heat.db.sqlalchemy import api as db_api
 from heat.engine import check_resource

heat/tests/engine/test_resource_type.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.engine import environment

heat/tests/engine/test_scheduler.py

@@ -12,10 +12,15 @@
 #    under the License.
 
 import contextlib
-import itertools
+from unittest import mock
 
 import eventlet
+<<<<<<< HEAD
 import mock
+=======
+import itertools
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import timeutils
 from heat.engine import dependencies

heat/tests/engine/test_sync_point.py

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 from oslo_db import exception
 
 from heat.engine import sync_point

heat/tests/fakes.py

@@ -18,8 +18,9 @@ wrong the tests might raise AssertionError. I've indicated in comments the
 places where actual behavior differs from the spec.
 """
 
+from unittest import mock
+
 from keystoneauth1 import plugin
-import mock
 
 
 class FakeClient(object):

heat/tests/openstack/aodh/test_alarm.py

@@ -14,8 +14,13 @@
 
 import copy
 import json
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/aodh/test_composite_alarm.py

@@ -12,8 +12,13 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/aodh/test_gnocchi_alarm.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/barbican/test_container.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/barbican/test_order.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/barbican/test_secret.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/blazar/test_host.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from blazarclient import exception as client_exception
-import mock
 from oslo_utils.fixture import uuidsentinel as uuids
 
 from heat.common import exception

heat/tests/openstack/blazar/test_lease.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from blazarclient import exception as client_exception
-import mock
 from oslo_utils.fixture import uuidsentinel as uuids
 
 from heat.common import exception

heat/tests/openstack/cinder/test_qos_specs.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.engine.clients.os import cinder as c_plugin
 from heat.engine.resources.openstack.cinder import qos_specs

heat/tests/openstack/cinder/test_quota.py

@@ -10,7 +10,13 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/cinder/test_volume.py

@@ -14,9 +14,9 @@
 import collections
 import copy
 import json
+from unittest import mock
 
 from cinderclient import exceptions as cinder_exp
-import mock
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/openstack/cinder/test_volume_type.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import collections
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.engine.clients.os import cinder as c_plugin

heat/tests/openstack/cinder/test_volume_type_encryption.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import exception
 from heat.engine.clients.os import cinder as c_plugin

heat/tests/openstack/cinder/test_volume_utils.py

@@ -11,8 +11,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from cinderclient.v2 import client as cinderclient
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.engine.clients.os import cinder
 from heat.engine.clients.os import nova

heat/tests/openstack/designate/test_recordset.py

@@ -11,8 +11,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 from designateclient import exceptions as designate_exception
-import mock
 
 from heat.common import exception
 from heat.engine.resources.openstack.designate import recordset

heat/tests/openstack/designate/test_zone.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import exception
 from heat.engine.resources.openstack.designate import zone

heat/tests/openstack/glance/test_image.py

@@ -11,7 +11,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from glanceclient import exc
 from heat.common import exception

heat/tests/openstack/heat/test_cloud_config.py

@@ -11,10 +11,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 import yaml
 
-import mock
 
 from heat.engine import stack
 from heat.engine import template

heat/tests/openstack/heat/test_deployed_server.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils

heat/tests/openstack/heat/test_instance_group.py

@@ -12,8 +12,13 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import grouputils

heat/tests/openstack/heat/test_instance_group_update_policy.py

@@ -12,8 +12,8 @@
 #    under the License.
 
 import json
+from unittest import mock
 
-import mock
 
 from heat.common import exception
 from heat.common import template_format

heat/tests/openstack/heat/test_multi_part.py

@@ -13,10 +13,9 @@
 
 import contextlib
 import email
+from unittest import mock
 import uuid
 
-import mock
-
 from heat.common import exception as exc
 from heat.engine import stack as parser
 from heat.engine import template

heat/tests/openstack/heat/test_none_resource.py

@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heat.common import template_format
 from heat.engine import resource

heat/tests/openstack/heat/test_random_string.py

@@ -12,8 +12,13 @@
 #    under the License.
 
 import re
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 from testtools import matchers
 
 from heat.common import exception

heat/tests/openstack/heat/test_remote_stack.py

@@ -13,11 +13,11 @@
 
 import collections
 import json
+from unittest import mock
 
 from heatclient import exc
 from heatclient.v1 import stacks
 from keystoneauth1 import loading as ks_loading
-import mock
 from oslo_config import cfg
 
 from heat.common import exception

heat/tests/openstack/heat/test_resource_chain.py

@@ -12,7 +12,13 @@
 #    under the License.
 
 import copy
+<<<<<<< HEAD
 import mock
+=======
+from unittest import mock
+
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.engine import node_data

heat/tests/openstack/heat/test_resource_group.py

@@ -12,8 +12,13 @@
 #    under the License.
 
 import copy
+from unittest import mock
 
+<<<<<<< HEAD
 import mock
+=======
+import six
+>>>>>>> f9b47ffef... Use unittest.mock instead of third party mock
 
 from heat.common import exception
 from heat.common import grouputils