diff options
54 files changed, 100 insertions, 103 deletions
diff --git a/ceilometer/tests/unit/compute/pollsters/base.py b/ceilometer/tests/unit/compute/pollsters/base.py index 9e7f26c9..49768dda 100644 --- a/ceilometer/tests/unit/compute/pollsters/base.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/pollsters/test_diskio.py b/ceilometer/tests/unit/compute/pollsters/test_diskio.py index 07638d23..a56e43b5 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_diskio.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/pollsters/test_memory.py b/ceilometer/tests/unit/compute/pollsters/test_memory.py index 39f9048a..351bfbaf 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_memory.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/pollsters/test_net.py b/ceilometer/tests/unit/compute/pollsters/test_net.py index f6ef35e5..63bbe626 100644 --- a/ceilometer/tests/unit/compute/pollsters/test_net.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/test_discovery.py b/ceilometer/tests/unit/compute/test_discovery.py index 33fe9aaf..e5c1c964 100644 --- a/ceilometer/tests/unit/compute/test_discovery.py +++ b/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: diff --git a/ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py index a515aff0..e01ae2e8 100644 --- a/ceilometer/tests/unit/compute/virt/hyperv/test_inspector.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py b/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py index 9404299b..6ca3c3be 100755 --- a/ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/virt/vmware/test_inspector.py b/ceilometer/tests/unit/compute/virt/vmware/test_inspector.py index 3796e791..e6af461b 100644 --- a/ceilometer/tests/unit/compute/virt/vmware/test_inspector.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.py b/ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.py index 8344dca7..8f93cd46 100644 --- a/ceilometer/tests/unit/compute/virt/vmware/test_vsphere_operations.py +++ b/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 diff --git a/ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py b/ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py index 07d18a48..94d65483 100644 --- a/ceilometer/tests/unit/compute/virt/xenapi/test_inspector.py +++ b/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 diff --git a/ceilometer/tests/unit/event/test_converter.py b/ceilometer/tests/unit/event/test_converter.py index d944ca09..8759e326 100644 --- a/ceilometer/tests/unit/event/test_converter.py +++ b/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 diff --git a/ceilometer/tests/unit/event/test_endpoint.py b/ceilometer/tests/unit/event/test_endpoint.py index 891f9d1d..6fed4ef9 100644 --- a/ceilometer/tests/unit/event/test_endpoint.py +++ b/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 diff --git a/ceilometer/tests/unit/hardware/inspector/test_snmp.py b/ceilometer/tests/unit/hardware/inspector/test_snmp.py index 53319c6e..d39ad5be 100644 --- a/ceilometer/tests/unit/hardware/inspector/test_snmp.py +++ b/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 diff --git a/ceilometer/tests/unit/hardware/pollsters/test_generic.py b/ceilometer/tests/unit/hardware/pollsters/test_generic.py index 4a24ceb5..fc55cce7 100644 --- a/ceilometer/tests/unit/hardware/pollsters/test_generic.py +++ b/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 diff --git a/ceilometer/tests/unit/ipmi/notifications/test_ironic.py b/ceilometer/tests/unit/ipmi/notifications/test_ironic.py index 5826d189..696748f0 100644 --- a/ceilometer/tests/unit/ipmi/notifications/test_ironic.py +++ b/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 diff --git a/ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py b/ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py index f41487f0..6a019654 100644 --- a/ceilometer/tests/unit/ipmi/platform/test_intel_node_manager.py +++ b/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 diff --git a/ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py b/ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py index f1f29520..21a1b113 100644 --- a/ceilometer/tests/unit/ipmi/platform/test_ipmi_sensor.py +++ b/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 diff --git a/ceilometer/tests/unit/ipmi/pollsters/base.py b/ceilometer/tests/unit/ipmi/pollsters/base.py index f07889d1..b0d169bf 100644 --- a/ceilometer/tests/unit/ipmi/pollsters/base.py +++ b/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 diff --git a/ceilometer/tests/unit/meter/test_meter_plugins.py b/ceilometer/tests/unit/meter/test_meter_plugins.py index d91b4906..3377555b 100644 --- a/ceilometer/tests/unit/meter/test_meter_plugins.py +++ b/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 diff --git a/ceilometer/tests/unit/meter/test_notifications.py b/ceilometer/tests/unit/meter/test_notifications.py index a4aea7ea..76c9f61a 100644 --- a/ceilometer/tests/unit/meter/test_notifications.py +++ b/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 diff --git a/ceilometer/tests/unit/network/services/test_fwaas.py b/ceilometer/tests/unit/network/services/test_fwaas.py index 96b959cb..7e75a554 100644 --- a/ceilometer/tests/unit/network/services/test_fwaas.py +++ b/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 diff --git a/ceilometer/tests/unit/network/services/test_lbaas.py b/ceilometer/tests/unit/network/services/test_lbaas.py index 2d8b9400..cc08ae98 100644 --- a/ceilometer/tests/unit/network/services/test_lbaas.py +++ b/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 diff --git a/ceilometer/tests/unit/network/services/test_lbaas_v2.py b/ceilometer/tests/unit/network/services/test_lbaas_v2.py index 003926e9..5750bfaa 100644 --- a/ceilometer/tests/unit/network/services/test_lbaas_v2.py +++ b/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 diff --git a/ceilometer/tests/unit/network/services/test_vpnaas.py b/ceilometer/tests/unit/network/services/test_vpnaas.py index 79a6a394..4645da98 100644 --- a/ceilometer/tests/unit/network/services/test_vpnaas.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opencontrail/test_client.py b/ceilometer/tests/unit/network/statistics/opencontrail/test_client.py index 9b25ee9d..4eba0523 100644 --- a/ceilometer/tests/unit/network/statistics/opencontrail/test_client.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py b/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py index 96bbcb3d..d4b718cf 100644 --- a/ceilometer/tests/unit/network/statistics/opencontrail/test_driver.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py index 0410b78f..2f852b05 100644 --- a/ceilometer/tests/unit/network/statistics/opendaylight/test_client.py +++ b/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 diff --git a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py b/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py index 1cc82e2e..7c08dd53 100644 --- a/ceilometer/tests/unit/network/statistics/opendaylight/test_driver.py +++ b/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 diff --git a/ceilometer/tests/unit/network/test_floating_ip.py b/ceilometer/tests/unit/network/test_floating_ip.py index e68b177c..74b0660a 100644 --- a/ceilometer/tests/unit/network/test_floating_ip.py +++ b/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 diff --git a/ceilometer/tests/unit/objectstore/test_rgw.py b/ceilometer/tests/unit/objectstore/test_rgw.py index 809a7bbf..14a83e17 100644 --- a/ceilometer/tests/unit/objectstore/test_rgw.py +++ b/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 diff --git a/ceilometer/tests/unit/objectstore/test_rgw_client.py b/ceilometer/tests/unit/objectstore/test_rgw_client.py index cc5958bd..f23d0e99 100644 --- a/ceilometer/tests/unit/objectstore/test_rgw_client.py +++ b/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 diff --git a/ceilometer/tests/unit/objectstore/test_swift.py b/ceilometer/tests/unit/objectstore/test_swift.py index f5f5592b..ec69be06 100644 --- a/ceilometer/tests/unit/objectstore/test_swift.py +++ b/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 diff --git a/ceilometer/tests/unit/pipeline_base.py b/ceilometer/tests/unit/pipeline_base.py index d08b7bd7..5a78a9d7 100644 --- a/ceilometer/tests/unit/pipeline_base.py +++ b/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 diff --git a/ceilometer/tests/unit/polling/test_discovery.py b/ceilometer/tests/unit/polling/test_discovery.py index ff18c5f2..bedbe5c0 100644 --- a/ceilometer/tests/unit/polling/test_discovery.py +++ b/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 diff --git a/ceilometer/tests/unit/polling/test_dynamic_pollster.py b/ceilometer/tests/unit/polling/test_dynamic_pollster.py index 912f7b8f..4fdad264 100644 --- a/ceilometer/tests/unit/polling/test_dynamic_pollster.py +++ b/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__) diff --git a/ceilometer/tests/unit/polling/test_manager.py b/ceilometer/tests/unit/polling/test_manager.py index 322bb3ad..d041393c 100644 --- a/ceilometer/tests/unit/polling/test_manager.py +++ b/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 diff --git a/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py b/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py index 33cb0dbf..b1bb4c3d 100644 --- a/ceilometer/tests/unit/polling/test_non_openstack_credentials_discovery.py +++ b/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): diff --git a/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py b/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py index 2a4d269e..278eebb6 100644 --- a/ceilometer/tests/unit/polling/test_non_openstack_dynamic_pollster.py +++ b/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'] diff --git a/ceilometer/tests/unit/publisher/test_gnocchi.py b/ceilometer/tests/unit/publisher/test_gnocchi.py index 28d17fea..796ddf64 100644 --- a/ceilometer/tests/unit/publisher/test_gnocchi.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_http.py b/ceilometer/tests/unit/publisher/test_http.py index a5a53067..d3649b4b 100644 --- a/ceilometer/tests/unit/publisher/test_http.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_messaging_publisher.py b/ceilometer/tests/unit/publisher/test_messaging_publisher.py index 8e280875..48ed8930 100644 --- a/ceilometer/tests/unit/publisher/test_messaging_publisher.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_monasca_data_filter.py b/ceilometer/tests/unit/publisher/test_monasca_data_filter.py index 8e6dfcae..915652f5 100644 --- a/ceilometer/tests/unit/publisher/test_monasca_data_filter.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_monasca_publisher.py b/ceilometer/tests/unit/publisher/test_monasca_publisher.py index 60095c27..ebd37db0 100755 --- a/ceilometer/tests/unit/publisher/test_monasca_publisher.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_prometheus.py b/ceilometer/tests/unit/publisher/test_prometheus.py index 510250d5..7c3216d5 100644 --- a/ceilometer/tests/unit/publisher/test_prometheus.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_udp.py b/ceilometer/tests/unit/publisher/test_udp.py index 53224e18..f15ebcda 100644 --- a/ceilometer/tests/unit/publisher/test_udp.py +++ b/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 diff --git a/ceilometer/tests/unit/publisher/test_zaqar.py b/ceilometer/tests/unit/publisher/test_zaqar.py index 04725919..d77728e9 100644 --- a/ceilometer/tests/unit/publisher/test_zaqar.py +++ b/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 diff --git a/ceilometer/tests/unit/test_declarative.py b/ceilometer/tests/unit/test_declarative.py index 64f6e937..400b5c09 100644 --- a/ceilometer/tests/unit/test_declarative.py +++ b/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 diff --git a/ceilometer/tests/unit/test_middleware.py b/ceilometer/tests/unit/test_middleware.py index 1b04e7de..81017b84 100644 --- a/ceilometer/tests/unit/test_middleware.py +++ b/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 diff --git a/ceilometer/tests/unit/test_monascaclient.py b/ceilometer/tests/unit/test_monascaclient.py index 33ce536f..4ee8e047 100644 --- a/ceilometer/tests/unit/test_monascaclient.py +++ b/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): diff --git a/ceilometer/tests/unit/test_neutronclient.py b/ceilometer/tests/unit/test_neutronclient.py index 6adbb597..c7332586 100644 --- a/ceilometer/tests/unit/test_neutronclient.py +++ b/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 diff --git a/ceilometer/tests/unit/test_neutronclient_lbaas_v2.py b/ceilometer/tests/unit/test_neutronclient_lbaas_v2.py index 3f54813f..64020139 100644 --- a/ceilometer/tests/unit/test_neutronclient_lbaas_v2.py +++ b/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 diff --git a/ceilometer/tests/unit/test_notification.py b/ceilometer/tests/unit/test_notification.py index 17b2e13d..dc869aa5 100644 --- a/ceilometer/tests/unit/test_notification.py +++ b/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 diff --git a/ceilometer/tests/unit/test_novaclient.py b/ceilometer/tests/unit/test_novaclient.py index 8d6a0139..a5e45b52 100644 --- a/ceilometer/tests/unit/test_novaclient.py +++ b/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 diff --git a/test-requirements.txt b/test-requirements.txt index de1123d2..e5d6c35b 100644 --- a/test-requirements.txt +++ b/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 |