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

ceilometer/tests/unit/compute/pollsters/base.py

@@ -13,9 +13,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.
+from unittest import mock
 
 import fixtures
-import mock
 
 from ceilometer.compute.virt import inspector as virt_inspector
 from ceilometer import service

ceilometer/tests/unit/compute/pollsters/test_diskio.py

@@ -14,7 +14,7 @@
 # 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 ceilometer.compute.pollsters import disk
 from ceilometer.compute.virt import inspector as virt_inspector

ceilometer/tests/unit/compute/pollsters/test_memory.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from ceilometer.compute.pollsters import instance_stats
 from ceilometer.compute.virt import inspector as virt_inspector

ceilometer/tests/unit/compute/pollsters/test_net.py

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from ceilometer.compute.pollsters import net
 from ceilometer.compute.virt import inspector as virt_inspector

ceilometer/tests/unit/compute/test_discovery.py

@@ -11,10 +11,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import datetime
+import iso8601
+from unittest import mock
 
 import fixtures
-import iso8601
-import mock
 import testtools
 
 try:

ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py

@@ -16,8 +16,8 @@ Tests for Hyper-V inspector.
 """
 
 import sys
+from unittest import mock
 
-import mock
 from os_win import exceptions as os_win_exc
 from oslo_utils import units
 from oslotest import base

ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py

@@ -11,11 +11,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for libvirt inspector.
-"""
+"""Tests for libvirt inspector."""
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import units
 from oslotest import base
 

ceilometer/tests/unit/compute/virt/vmware/test_inspector.py

@@ -16,7 +16,8 @@
 Tests for VMware vSphere inspector.
 """
 
-import mock
+from unittest import mock
+
 from oslo_vmware import api
 from oslotest import base
 

ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.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_vmware import api
 from oslotest import base
 

ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py

@@ -11,10 +11,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for xenapi inspector.
-"""
+"""Tests for xenapi inspector."""
+
+from unittest import mock
 
-import mock
 from oslotest import base
 
 from ceilometer.compute.virt.xenapi import inspector as xenapi_inspector

ceilometer/tests/unit/event/test_converter.py

@@ -14,9 +14,9 @@
 # under the License.
 
 import datetime
+from unittest import mock
 
 import jsonpath_rw_ext
-import mock
 import six
 
 from ceilometer import declarative

ceilometer/tests/unit/event/test_endpoint.py

@@ -13,9 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 """Tests for Ceilometer notify daemon."""
+from unittest import mock
 
 import fixtures
-import mock
 import oslo_messaging
 from oslo_utils import fileutils
 import six

ceilometer/tests/unit/hardware/inspector/test_snmp.py

@@ -12,10 +12,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/hardware/inspector/snmp/inspector.py
-"""
+"""Tests for ceilometer/hardware/inspector/snmp/inspector.py"""
+from unittest import mock
+
 import fixtures
-import mock
 from oslo_utils import netutils
 from pysnmp.proto import rfc1905
 import six

ceilometer/tests/unit/hardware/pollsters/test_generic.py

@@ -13,12 +13,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
-import six
-import yaml
+from unittest import mock
 
 import fixtures
 from oslo_utils import fileutils
+import six
+import yaml
 
 from ceilometer import declarative
 from ceilometer.hardware.inspector import base as inspector_base

ceilometer/tests/unit/ipmi/notifications/test_ironic.py

@@ -12,10 +12,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for producing IPMI sample messages from notification events.
-"""
+"""Tests for producing IPMI sample messages from notification events."""
+
+from unittest import mock
 
-import mock
 from oslotest import base
 
 from ceilometer.ipmi.notifications import ironic as ipmi

ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py

@@ -14,8 +14,8 @@
 
 import abc
 import tempfile
+from unittest import mock
 
-import mock
 from oslotest import base
 import six
 

ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py

@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslotest import base
 
 from ceilometer.ipmi.platform import ipmi_sensor

ceilometer/tests/unit/ipmi/pollsters/base.py

@@ -13,9 +13,9 @@
 # under the License.
 
 import abc
+from unittest import mock
 
 import fixtures
-import mock
 import six
 
 from ceilometer.polling import manager

ceilometer/tests/unit/meter/test_meter_plugins.py

@@ -12,7 +12,8 @@
 # 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 oslotest import base
 
 from ceilometer.event import trait_plugins

ceilometer/tests/unit/meter/test_notifications.py

@@ -10,16 +10,15 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer.meter.notifications
-"""
+"""Tests for ceilometer.meter.notifications"""
 import copy
-import fixtures
-import mock
-import six
-import yaml
+from unittest import mock
 
+import fixtures
 from oslo_utils import encodeutils
 from oslo_utils import fileutils
+import six
+import yaml
 
 from ceilometer import declarative
 from ceilometer.meter import notifications

ceilometer/tests/unit/network/services/test_fwaas.py

@@ -12,9 +12,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.
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from ceilometer.network.services import discovery

ceilometer/tests/unit/network/services/test_lbaas.py

@@ -12,9 +12,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.
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from ceilometer.network.services import discovery

ceilometer/tests/unit/network/services/test_lbaas_v2.py

@@ -11,9 +11,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.
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from ceilometer.network.services import discovery

ceilometer/tests/unit/network/services/test_vpnaas.py

@@ -12,9 +12,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.
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from ceilometer.network.services import discovery

ceilometer/tests/unit/network/statistics/opencontrail/test_client.py

@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslo_config import fixture as config_fixture
 from oslotest import base
 

ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py

@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from oslotest import base
 from six.moves.urllib import parse as urlparse
 

ceilometer/tests/unit/network/statistics/opendaylight/test_client.py

@@ -12,7 +12,8 @@
 # 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 oslo_config import fixture as config_fixture
 from oslotest import base
 from requests import auth as req_auth

ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py

@@ -13,8 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 import abc
+from unittest import mock
 
-import mock
 from oslotest import base
 import six
 from six.moves.urllib import parse as url_parse

ceilometer/tests/unit/network/test_floating_ip.py

@@ -13,9 +13,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.
+from unittest import mock
 
 import fixtures
-import mock
 from oslotest import base
 
 from ceilometer.network import floatingip

ceilometer/tests/unit/objectstore/test_rgw.py

@@ -13,10 +13,10 @@
 # under the License.
 
 import collections
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import exceptions
-import mock
 from oslotest import base
 import testscenarios.testcase
 

ceilometer/tests/unit/objectstore/test_rgw_client.py

@@ -13,8 +13,8 @@
 # under the License.
 
 import json
+from unittest import mock
 
-import mock
 from oslotest import base
 
 from ceilometer.objectstore import rgw_client

ceilometer/tests/unit/objectstore/test_swift.py

@@ -13,10 +13,10 @@
 # under the License.
 
 import collections
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import exceptions
-import mock
 from oslotest import base
 from swiftclient import client as swift_client
 import testscenarios.testcase

ceilometer/tests/unit/pipeline_base.py

@@ -16,9 +16,9 @@
 
 import abc
 import traceback
+from unittest import mock
 
 import fixtures
-import mock
 from oslo_utils import timeutils
 import six
 

ceilometer/tests/unit/polling/test_discovery.py

@@ -12,10 +12,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/central/manager.py
-"""
+"""Tests for ceilometer/central/manager.py"""
+
+from unittest import mock
 
-import mock
 from oslotest import base
 
 from ceilometer.hardware import discovery as hardware

ceilometer/tests/unit/polling/test_dynamic_pollster.py

@@ -11,21 +11,18 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-"""Tests for ceilometer/polling/dynamic_pollster.py
-"""
+"""Tests for ceilometer/polling/dynamic_pollster.py"""
+import copy
+import logging
+from unittest import mock
 
 from oslotest import base
+import requests
 
 from ceilometer.declarative import DynamicPollsterDefinitionException
 from ceilometer.polling import dynamic_pollster
 from ceilometer import sample
 
-import copy
-import logging
-import mock
-
-import requests
-
 LOG = logging.getLogger(__name__)
 
 

ceilometer/tests/unit/polling/test_manager.py

@@ -18,9 +18,9 @@
 """Tests for ceilometer agent manager"""
 import copy
 import datetime
-import fixtures
-import mock
+from unittest import mock
 
+import fixtures
 from keystoneauth1 import exceptions as ka_exceptions
 from stevedore import extension
 
@@ -34,7 +34,6 @@ from ceilometer.polling import manager
 from ceilometer.polling import plugin_base
 from ceilometer import sample
 from ceilometer import service
-
 from ceilometer.tests import base
 
 

ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py

@@ -11,13 +11,14 @@
 # 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 oslotest import base
 import requests
 
 from ceilometer.polling.discovery.endpoint import EndpointDiscovery
 from ceilometer.polling.discovery.non_openstack_credentials_discovery import \
     NonOpenStackCredentialsDiscovery
-from oslotest import base
 
 
 class TestNonOpenStackCredentialsDiscovery(base.BaseTestCase):

ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py

@@ -11,12 +11,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-"""Tests for ceilometer/polling/non_openstack_dynamic_pollster.py
-"""
+"""Tests for ceilometer/polling/non_openstack_dynamic_pollster.py"""
 import copy
 import sys
+from unittest import mock
 
-import mock
+from oslotest import base
 import requests
 
 from ceilometer.declarative import DynamicPollsterDefinitionException
@@ -28,9 +28,6 @@ from ceilometer.polling.dynamic_pollster import \
 from ceilometer.polling.dynamic_pollster import PollsterSampleGatherer
 from ceilometer.polling.dynamic_pollster import SingleMetricPollsterDefinitions
 
-
-from oslotest import base
-
 REQUIRED_POLLSTER_FIELDS = ['name', 'sample_type', 'unit', 'value_attribute',
                             'url_path', 'module', 'authentication_object']
 

ceilometer/tests/unit/publisher/test_gnocchi.py

@@ -14,12 +14,12 @@
 # under the License.
 
 import os
+from unittest import mock
 import uuid
 
 import fixtures
 from gnocchiclient import exceptions as gnocchi_exc
 from keystoneauth1 import exceptions as ka_exceptions
-import mock
 from oslo_config import fixture as config_fixture
 from oslo_utils import fileutils
 from oslo_utils import fixture as utils_fixture

ceilometer/tests/unit/publisher/test_http.py

@@ -12,15 +12,15 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/publisher/http.py
-"""
+"""Tests for ceilometer/publisher/http.py"""
 
 import datetime
-import mock
+from unittest import mock
+import uuid
+
 from oslotest import base
 import requests
 from six.moves.urllib import parse as urlparse
-import uuid
 
 from ceilometer.event import models as event
 from ceilometer.publisher import http

ceilometer/tests/unit/publisher/test_messaging_publisher.py

@@ -12,12 +12,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/publisher/messaging.py
-"""
+"""Tests for ceilometer/publisher/messaging.py"""
 import datetime
+from unittest import mock
 import uuid
 
-import mock
 import oslo_messaging
 from oslo_messaging._drivers import impl_kafka as kafka_driver
 from oslo_utils import netutils

ceilometer/tests/unit/publisher/test_monasca_data_filter.py

@@ -15,7 +15,8 @@
 # under the License.
 
 import datetime
-import mock
+from unittest import mock
+
 from oslo_utils import timeutils
 from oslotest import base
 

ceilometer/tests/unit/publisher/test_monasca_publisher.py

@@ -13,14 +13,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.
-"""Tests for ceilometer/publisher/monasca.py
-"""
+"""Tests for ceilometer/publisher/monasca.py"""
 
 import datetime
 import fixtures
 import time
+from unittest import mock
 
-import mock
 from oslotest import base
 
 from ceilometer import monasca_client as mon_client

ceilometer/tests/unit/publisher/test_prometheus.py

@@ -12,15 +12,15 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/publisher/prometheus.py
-"""
+"""Tests for ceilometer/publisher/prometheus.py"""
 
 import datetime
-import mock
+from unittest import mock
+import uuid
+
 from oslotest import base
 import requests
 from six.moves.urllib import parse as urlparse
-import uuid
 
 from ceilometer.publisher import prometheus
 from ceilometer import sample

ceilometer/tests/unit/publisher/test_udp.py

@@ -12,12 +12,11 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-"""Tests for ceilometer/publisher/udp.py
-"""
+"""Tests for ceilometer/publisher/udp.py"""
 
 import datetime
+from unittest import mock
 
-import mock
 import msgpack
 from oslo_utils import netutils
 from oslotest import base

ceilometer/tests/unit/publisher/test_zaqar.py

@@ -12,10 +12,11 @@
 # under the License.
 
 import datetime
-import mock
+from unittest import mock
+import uuid
+
 from oslotest import base
 from six.moves.urllib import parse as urlparse
-import uuid
 
 from ceilometer.event import models as event
 from ceilometer.publisher import zaqar

ceilometer/tests/unit/test_declarative.py

@@ -12,9 +12,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.
+from unittest import mock
 
 import fixtures
-import mock
 
 from ceilometer import declarative
 from ceilometer.tests import base

ceilometer/tests/unit/test_middleware.py

@@ -12,7 +12,7 @@
 # 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 ceilometer import middleware
 from ceilometer import service

ceilometer/tests/unit/test_monascaclient.py

@@ -12,17 +12,16 @@
 # 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 monascaclient import exc
 from oslo_utils import netutils
 from oslotest import base
+import tenacity
 
 from ceilometer import monasca_client
 from ceilometer import service
 
-from monascaclient import exc
-import tenacity
-
 
 class TestMonascaClient(base.BaseTestCase):
     def setUp(self):

ceilometer/tests/unit/test_neutronclient.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
 
 from oslotest import base
 

ceilometer/tests/unit/test_neutronclient_lbaas_v2.py

@@ -11,7 +11,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 from neutronclient.v2_0 import client
 from oslotest import base
 

ceilometer/tests/unit/test_notification.py

@@ -15,8 +15,8 @@
 """Tests for Ceilometer notify daemon."""
 
 import time
+from unittest import mock
 
-import mock
 from oslo_utils import fileutils
 import six
 import yaml

ceilometer/tests/unit/test_novaclient.py

@@ -11,10 +11,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+from unittest import mock
 
 import fixtures
 import glanceclient
-import mock
 import novaclient
 from oslotest import base
 

test-requirements.txt

@@ -4,7 +4,6 @@
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=2.0.0 # BSD
 os-win>=3.0.0 # Apache-2.0
 oslo.messaging[kafka]>=6.2.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0