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: Ic07c0f6fa0b23242eb884cc34ac9d963b3030b17
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>

sahara/tests/unit/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 oslotest import base
 
 from sahara import context

sahara/tests/unit/cli/image_pack/test_image_pack_api.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 sys
 guestfs = mock.Mock()

sahara/tests/unit/cli/test_sahara_cli.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 sahara.cli import sahara_all
 from sahara.cli import sahara_api

sahara/tests/unit/conductor/manager/test_clusters.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from sqlalchemy import exc as sa_exc
 import testtools
 

sahara/tests/unit/conductor/manager/test_edp.py

@@ -15,8 +15,8 @@
 
 import copy
 import datetime
+from unittest import mock
 
-import mock
 from sqlalchemy import exc as sa_exc
 import testtools
 

sahara/tests/unit/conductor/manager/test_templates.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 import six
 from sqlalchemy import exc as sa_ex

sahara/tests/unit/db/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
 

sahara/tests/unit/db/sqlalchemy/test_types.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import sqlalchemy as sa
 import testtools
+from unittest import mock
 
 from sahara.db.sqlalchemy import types
 

sahara/tests/unit/db/templates/test_update.py

@@ -14,9 +14,9 @@
 
 import copy
 import tempfile
+from unittest import mock
 
 import jsonschema
-import mock
 from oslo_serialization import jsonutils as json
 from oslo_utils import uuidutils
 

sahara/tests/unit/db/test_utils.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import context
 from sahara.db.sqlalchemy import api

sahara/tests/unit/plugins/test_images.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 uuidutils
 import yaml
 

sahara/tests/unit/plugins/test_kerberos.py

@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from sahara import context
 from sahara.plugins import kerberos as krb

sahara/tests/unit/plugins/test_labels.py

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import jsonschema.exceptions as json_exc
-import mock
 import testtools
+from unittest import mock
 
 from sahara import conductor as cond
 from sahara import context

sahara/tests/unit/plugins/test_provide_recommendations.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 six
 
 from sahara import conductor as cond

sahara/tests/unit/plugins/test_utils.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 sahara.plugins import exceptions as ex
 from sahara.plugins import utils as pu

sahara/tests/unit/service/api/test_v10.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 oslo_messaging
 import six
 import testtools

sahara/tests/unit/service/api/v2/test_clusters.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 oslo_messaging
 import six
 import testtools

sahara/tests/unit/service/api/v2/test_images.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 sahara.service.api.v2 import images
 from sahara.tests.unit import base

sahara/tests/unit/service/edp/binary_retrievers/test_dispatch.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 sahara.service.edp.binary_retrievers import dispatch
 from sahara.tests.unit import base

sahara/tests/unit/service/edp/binary_retrievers/test_internal_swift.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 sahara.exceptions as ex
 from sahara.service.castellan import config as castellan

sahara/tests/unit/service/edp/binary_retrievers/test_manila.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 sahara.service.edp.binary_retrievers.manila_share as ms
 from sahara.tests.unit import base

sahara/tests/unit/service/edp/data_sources/base_test.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 uuidutils
 
 from sahara.service.edp.data_sources.base import DataSourceType

sahara/tests/unit/service/edp/data_sources/hdfs/test_hdfs_type.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 import sahara.exceptions as ex
 from sahara.service.edp.data_sources.hdfs.implementation import HDFSType

sahara/tests/unit/service/edp/data_sources/manila/test_manila_type.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 uuidutils
 import testtools
 

sahara/tests/unit/service/edp/data_sources/s3/test_s3_type.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 import sahara.exceptions as ex
 from sahara.service.edp.data_sources.s3.implementation import S3Type

sahara/tests/unit/service/edp/data_sources/swift/test_swift_type.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 from oslo_utils import uuidutils
 import testtools
 

sahara/tests/unit/service/edp/edp_test_utils.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from sahara import conductor as cond

sahara/tests/unit/service/edp/job_binaries/internal_db/test_internal_db_type.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 uuidutils
 import testtools
 

sahara/tests/unit/service/edp/job_binaries/manila/test_manila_type.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 uuidutils
 import testtools
 

sahara/tests/unit/service/edp/job_binaries/s3/test_s3_type.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import exceptions as ex
 from sahara.service.edp.job_binaries.s3.implementation import S3Type

sahara/tests/unit/service/edp/job_binaries/swift/test_swift_type.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 import sahara.exceptions as ex
 from sahara.service.castellan import config as castellan

sahara/tests/unit/service/edp/job_binaries/test_base.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 sahara.service.edp.job_binaries import base as jb_base
 from sahara.tests.unit import base

sahara/tests/unit/service/edp/oozie/test_oozie.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 sahara import context as ctx
 from sahara.plugins import base as pb

sahara/tests/unit/service/edp/spark/base.py

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
-import mock
 
 import sahara.exceptions as ex
 from sahara.service.edp.job_utils import ds_manager

sahara/tests/unit/service/edp/storm/test_storm.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import os
+from unittest import mock
 
-import mock
 
 import sahara.exceptions as ex
 from sahara.service.edp.job_utils import ds_manager

sahara/tests/unit/service/edp/test_hdfs_helper.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 sahara.plugins import exceptions as ex
 from sahara.service.edp import hdfs_helper as helper

sahara/tests/unit/service/edp/test_job_manager.py

@@ -14,9 +14,9 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 import xml.dom.minidom as xml
 
-import mock
 import testtools
 
 from sahara import conductor as cond

sahara/tests/unit/service/edp/test_job_utils.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 import testtools
 

sahara/tests/unit/service/edp/test_s3_common.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import exceptions as ex
 from sahara.service.edp import s3_common

sahara/tests/unit/service/edp/utils/test_shares.py

@@ -18,7 +18,8 @@ try:
     from manilaclient.common.apiclient import exceptions as manila_ex
 except ImportError:
     from manilaclient.openstack.common.apiclient import exceptions as manila_ex
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 import testtools
 

sahara/tests/unit/service/health/test_verification_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
+
 import six
 import testtools
 

sahara/tests/unit/service/heat/test_templates.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 sahara.conductor import resource as r
 from sahara.service.heat import templates as h

sahara/tests/unit/service/test_coordinator.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 sahara.service import coordinator
 from sahara.tests.unit import base

sahara/tests/unit/service/test_engine.py

@@ -15,7 +15,7 @@
 
 
 from heatclient import exc as heat_exc
-import mock
+from unittest import mock
 
 from sahara.service import engine
 from sahara.service.heat import heat_engine

sahara/tests/unit/service/test_networks.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 sahara.service import networks
 from sahara.tests.unit import base

sahara/tests/unit/service/test_ntp_service.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 sahara.service import ntp_service as ntp
 from sahara.tests.unit import base as test_base

sahara/tests/unit/service/test_ops.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 sahara.plugins import base as base_plugins
 from sahara.service import ops

sahara/tests/unit/service/test_periodic.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 
 from sahara.conductor import manager

sahara/tests/unit/service/test_quotas.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 import testtools
 

sahara/tests/unit/service/test_sessions.py

@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from keystoneauth1 import session as keystone
-import mock
 
 from sahara import exceptions as ex
 from sahara.service import sessions

sahara/tests/unit/service/test_trusts.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 sahara.service import trusts
 from sahara.tests.unit import base

sahara/tests/unit/service/test_volumes.py

@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from cinderclient.v2 import volumes as vol_v2
 from cinderclient.v3 import volumes as vol_v3
-import mock
 
 from sahara import exceptions as ex
 from sahara.service import volumes

sahara/tests/unit/service/validation/edp/test_data_source.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 import testtools
 

sahara/tests/unit/service/validation/edp/test_job.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 sahara import exceptions as ex
 from sahara.service.validations.edp import job as j

sahara/tests/unit/service/validation/edp/test_job_binary.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 sahara.service.api import v10 as api
 from sahara.service.validations.edp import job_binary as b

sahara/tests/unit/service/validation/edp/test_job_binary_internal.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 sahara.service.api import v10 as api
 from sahara.service.validations.edp import job_binary_internal as jb

sahara/tests/unit/service/validation/edp/test_job_executor.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import time
+from unittest import mock
 
-import mock
 from oslo_utils import timeutils
 from oslo_utils import uuidutils
 import testtools

sahara/tests/unit/service/validation/edp/test_job_interface.py

@@ -15,8 +15,8 @@
 
 import collections
 import itertools
+from unittest import mock
 
-import mock
 
 from sahara.service.validations.edp import job as j
 from sahara.service.validations.edp import job_execution_schema as j_e_schema

sahara/tests/unit/service/validation/test_cluster_create_validation.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 six
 import testtools
 

sahara/tests/unit/service/validation/test_cluster_delete_validation.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import exceptions as ex
 from sahara.service import validation as v

sahara/tests/unit/service/validation/test_cluster_scaling_validation.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 six
 import testtools
 

sahara/tests/unit/service/validation/test_cluster_template_create_validation.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from sahara.service.api import v10 as api

sahara/tests/unit/service/validation/test_cluster_template_update_validation.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 
 from sahara.service.api import v10 as api
 from sahara.service.validations import cluster_template_schema as ct_schema

sahara/tests/unit/service/validation/test_cluster_update_validation.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import exceptions as ex
 from sahara.service.api import v10 as api

sahara/tests/unit/service/validation/test_ng_template_validation_create.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 sahara.service.api import v10 as api
 from sahara.service.validations import node_group_template_schema as ngt_schema

sahara/tests/unit/service/validation/test_share_validations.py

@@ -17,7 +17,7 @@ try:
     from manilaclient.common.apiclient import exceptions as manila_ex
 except ImportError:
     from manilaclient.openstack.common.apiclient import exceptions as manila_ex
-import mock
+from unittest import mock
 
 from sahara.service.validations import shares
 from sahara.tests.unit.service.validation import utils as u

sahara/tests/unit/service/validation/test_validation.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 sahara import exceptions
 from sahara.service import validation

sahara/tests/unit/service/validation/utils.py

@@ -15,8 +15,8 @@
 
 import ast
 import re
+from unittest import mock
 
-import mock
 from neutronclient.common import exceptions as neutron_ex
 import novaclient.exceptions as nova_ex
 import six

sahara/tests/unit/swift/test_swift_helper.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 sahara.swift import swift_helper as h
 from sahara.tests.unit import base

sahara/tests/unit/swift/test_utils.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 sahara.swift import utils
 from sahara.tests.unit import base as testbase

sahara/tests/unit/test_context.py

@@ -14,9 +14,9 @@
 # limitations under the License.
 
 import random
+from unittest import mock
 
 import fixtures
-import mock
 import six
 import testtools
 

sahara/tests/unit/test_main.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import context
 from sahara import main

sahara/tests/unit/topology/test_topology.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import tempfile
+from unittest import mock
 
-import mock
 
 from sahara.conductor import objects as o
 from sahara import context

sahara/tests/unit/utils/notification/test_sender.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 sahara import context
 from sahara.tests.unit import base

sahara/tests/unit/utils/openstack/test_base.py

@@ -14,10 +14,11 @@
 # limitations under the License.
 
 
+from unittest import mock
+
 from cinderclient import exceptions as cinder_exc
 from heatclient import exc as heat_exc
 from keystoneauth1 import exceptions as keystone_exc
-import mock
 from neutronclient.common import exceptions as neutron_exc
 from novaclient import exceptions as nova_exc
 

sahara/tests/unit/utils/openstack/test_heat.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara.utils.openstack import heat as heat_u
 

sahara/tests/unit/utils/openstack/test_images.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 sahara.tests.unit import base
 from sahara.utils.openstack import images as sahara_images

sahara/tests/unit/utils/openstack/test_swift.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 sahara.tests.unit import base as testbase
 from sahara.utils.openstack import swift

sahara/tests/unit/utils/test_api.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 import testtools
 
 from sahara.utils import api

sahara/tests/unit/utils/test_cinder.py

@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from unittest import mock
+
 from keystoneauth1 import exceptions as keystone_exceptions
-import mock
 from oslo_config import cfg
 
 from sahara import main

sahara/tests/unit/utils/test_cluster.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 sahara import conductor
 from sahara import context

sahara/tests/unit/utils/test_cluster_progress_ops.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from sahara import conductor

sahara/tests/unit/utils/test_edp.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara.utils import edp
 

sahara/tests/unit/utils/test_general.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 sahara.tests.unit import base
 from sahara.utils import general

sahara/tests/unit/utils/test_heat.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 from sahara import exceptions as ex
 from sahara.utils.openstack import heat as h

sahara/tests/unit/utils/test_neutron.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 sahara.tests.unit import base
 from sahara.utils.openstack import neutron as neutron_client

sahara/tests/unit/utils/test_poll_utils.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 six
 import testtools
 

sahara/tests/unit/utils/test_proxy.py

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 
-import mock
+from unittest import mock
+
 from oslo_utils import uuidutils
 
 from sahara.service.edp import job_utils

sahara/tests/unit/utils/test_rpc.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 sahara import main
 from sahara.tests.unit import base

sahara/tests/unit/utils/test_ssh_remote.py

@@ -15,8 +15,8 @@
 
 
 import shlex
+from unittest import mock
 
-import mock
 import testtools
 
 from sahara import exceptions as ex

test-requirements.txt

@@ -10,7 +10,6 @@ bashate>=0.5.1 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
 psycopg2>=2.7.3 # LGPL/ZPL