diff --git a/congress/tests/api/base.py b/congress/tests/api/base.py index 39fd3ea9e..e87d06542 100644 --- a/congress/tests/api/base.py +++ b/congress/tests/api/base.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. # +from unittest import mock + from futurist import periodics -import mock from oslo_config import cfg from congress.api import base as api_base diff --git a/congress/tests/api/test_application.py b/congress/tests/api/test_application.py index 6591c6803..45da396a2 100644 --- a/congress/tests/api/test_application.py +++ b/congress/tests/api/test_application.py @@ -18,8 +18,8 @@ from __future__ import division from __future__ import absolute_import import json +from unittest import mock -import mock from oslo_config import cfg import webob diff --git a/congress/tests/api/test_datasource_model.py b/congress/tests/api/test_datasource_model.py index af6950a43..6a3b72915 100644 --- a/congress/tests/api/test_datasource_model.py +++ b/congress/tests/api/test_datasource_model.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + from oslo_config import cfg from six.moves import reduce diff --git a/congress/tests/api/test_policy_model.py b/congress/tests/api/test_policy_model.py index 35047cf37..728c85a0a 100644 --- a/congress/tests/api/test_policy_model.py +++ b/congress/tests/api/test_policy_model.py @@ -18,7 +18,8 @@ from __future__ import division from __future__ import absolute_import import copy -import mock +from unittest import mock + from oslo_utils import uuidutils from congress.api import error_codes diff --git a/congress/tests/api/test_rule_model.py b/congress/tests/api/test_rule_model.py index 6de8ea8c3..04b33ba95 100644 --- a/congress/tests/api/test_rule_model.py +++ b/congress/tests/api/test_rule_model.py @@ -16,7 +16,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.api import rule_model from congress.api import webservice diff --git a/congress/tests/api/test_webservice.py b/congress/tests/api/test_webservice.py index fe82b8e66..c2b9ebde3 100644 --- a/congress/tests/api/test_webservice.py +++ b/congress/tests/api/test_webservice.py @@ -17,17 +17,12 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -try: - # For Python 3 - import http.client as httplib -except ImportError: - import httplib +import http.client as httplib import json - -import mock -import webob +from unittest import mock from oslo_utils import uuidutils +import webob from congress.api import webservice from congress.tests import base diff --git a/congress/tests/base.py b/congress/tests/base.py index e3fa66515..e864b0fab 100644 --- a/congress/tests/base.py +++ b/congress/tests/base.py @@ -19,9 +19,9 @@ from __future__ import division from __future__ import absolute_import import contextlib import os +from unittest import mock import fixtures -import mock from mox3 import mox from oslo_config import cfg import six diff --git a/congress/tests/base_rpc.py b/congress/tests/base_rpc.py index 2c902de4e..16923c592 100644 --- a/congress/tests/base_rpc.py +++ b/congress/tests/base_rpc.py @@ -14,10 +14,8 @@ # under the License. # -""" -Utilities for testing RPC clients. -""" -import mock +"""Utilities for testing RPC clients.""" +from unittest import mock from oslotest import base diff --git a/congress/tests/cfg_validator/agent/test_agent.py b/congress/tests/cfg_validator/agent/test_agent.py index af1037f2e..ed9f4d8b4 100644 --- a/congress/tests/cfg_validator/agent/test_agent.py +++ b/congress/tests/cfg_validator/agent/test_agent.py @@ -15,14 +15,13 @@ # """Tests for the config validator agent.""" -from os import path - import json -import mock -import six +from os import path +from unittest import mock from oslo_config import cfg from oslo_log import log as logging +import six from congress.cfg_validator.agent import agent from congress.cfg_validator.agent import opts diff --git a/congress/tests/cfg_validator/agent/test_generator.py b/congress/tests/cfg_validator/agent/test_generator.py index 4feda673e..922815464 100644 --- a/congress/tests/cfg_validator/agent/test_generator.py +++ b/congress/tests/cfg_validator/agent/test_generator.py @@ -14,7 +14,7 @@ # under the License. # """Unit test for the marshalling of options""" -import mock +from unittest import mock from oslo_config import cfg from oslo_config import types diff --git a/congress/tests/datasources/fakes.py b/congress/tests/datasources/fakes.py index 9701d58e0..b770af40e 100644 --- a/congress/tests/datasources/fakes.py +++ b/congress/tests/datasources/fakes.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock # Sample responses from neutron-client, after parsing network_response = { diff --git a/congress/tests/datasources/json_ingester/test_exec_api.py b/congress/tests/datasources/json_ingester/test_exec_api.py index 43c5c52a9..e7660cecd 100644 --- a/congress/tests/datasources/json_ingester/test_exec_api.py +++ b/congress/tests/datasources/json_ingester/test_exec_api.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources.json_ingester import exec_api from congress.tests import base diff --git a/congress/tests/datasources/json_ingester/test_json_ingester.py b/congress/tests/datasources/json_ingester/test_json_ingester.py index ce1fed96c..7c87b74fe 100644 --- a/congress/tests/datasources/json_ingester/test_json_ingester.py +++ b/congress/tests/datasources/json_ingester/test_json_ingester.py @@ -17,10 +17,9 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import +from unittest import mock import uuid -import mock - from congress.datasources import datasource_driver from congress.datasources.json_ingester import json_ingester from congress import exception diff --git a/congress/tests/datasources/test_cfgvalidator_driver.py b/congress/tests/datasources/test_cfgvalidator_driver.py index c3772e931..09b7eec1f 100644 --- a/congress/tests/datasources/test_cfgvalidator_driver.py +++ b/congress/tests/datasources/test_cfgvalidator_driver.py @@ -15,7 +15,8 @@ # """Test the configuration validator driver""" -import mock +from unittest import mock + from oslo_config import cfg from oslo_config import types from oslo_log import log as logging diff --git a/congress/tests/datasources/test_cloudfoundryv2_driver.py b/congress/tests/datasources/test_cloudfoundryv2_driver.py index 06e6155f0..59484d6c6 100644 --- a/congress/tests/datasources/test_cloudfoundryv2_driver.py +++ b/congress/tests/datasources/test_cloudfoundryv2_driver.py @@ -18,10 +18,10 @@ from __future__ import division from __future__ import absolute_import import sys +from unittest import mock # NOTE(arosen): done to avoid the fact that cloudfoundryclient # isn't in the openstack global requirements. -import mock sys.modules['cloudfoundryclient.v2.client'] = mock.Mock() sys.modules['cloudfoundryclient.v2'] = mock.Mock() sys.modules['cloudfoundryclient'] = mock.Mock() diff --git a/congress/tests/datasources/test_datasource_driver.py b/congress/tests/datasources/test_datasource_driver.py index 0387010cb..2ec65b375 100644 --- a/congress/tests/datasources/test_datasource_driver.py +++ b/congress/tests/datasources/test_datasource_driver.py @@ -19,9 +19,9 @@ from __future__ import absolute_import import copy import hashlib import json +from unittest import mock import eventlet -import mock from oslo_utils import uuidutils from congress import data_types diff --git a/congress/tests/datasources/test_doctor_driver.py b/congress/tests/datasources/test_doctor_driver.py index 23d430d48..b9e062330 100644 --- a/congress/tests/datasources/test_doctor_driver.py +++ b/congress/tests/datasources/test_doctor_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import doctor_driver from congress.tests import base diff --git a/congress/tests/datasources/test_glancev2_driver.py b/congress/tests/datasources/test_glancev2_driver.py index 148a2c108..2cf59374f 100644 --- a/congress/tests/datasources/test_glancev2_driver.py +++ b/congress/tests/datasources/test_glancev2_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import glancev2_driver from congress.tests import base diff --git a/congress/tests/datasources/test_heatv1_driver.py b/congress/tests/datasources/test_heatv1_driver.py index ae2dff8cc..5805ef637 100644 --- a/congress/tests/datasources/test_heatv1_driver.py +++ b/congress/tests/datasources/test_heatv1_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from heatclient.v1 import events from heatclient.v1 import resources diff --git a/congress/tests/datasources/test_ironic_driver.py b/congress/tests/datasources/test_ironic_driver.py index 592588994..79be94fa8 100644 --- a/congress/tests/datasources/test_ironic_driver.py +++ b/congress/tests/datasources/test_ironic_driver.py @@ -17,11 +17,12 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import +from unittest import mock + import ironicclient.v1.chassis as IrChassis import ironicclient.v1.driver as IrDriver import ironicclient.v1.node as IrNode import ironicclient.v1.port as IrPort -import mock from congress.datasources import ironic_driver from congress.tests import base diff --git a/congress/tests/datasources/test_keystone_driver.py b/congress/tests/datasources/test_keystone_driver.py index d4fccc398..cc86649fd 100644 --- a/congress/tests/datasources/test_keystone_driver.py +++ b/congress/tests/datasources/test_keystone_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import keystone_driver from congress.tests import base diff --git a/congress/tests/datasources/test_keystonev3_driver.py b/congress/tests/datasources/test_keystonev3_driver.py index e5445137c..9ad35ce1b 100644 --- a/congress/tests/datasources/test_keystonev3_driver.py +++ b/congress/tests/datasources/test_keystonev3_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import keystonev3_driver from congress.tests import base diff --git a/congress/tests/datasources/test_mistral_driver.py b/congress/tests/datasources/test_mistral_driver.py index 81f9a5289..00171510b 100644 --- a/congress/tests/datasources/test_mistral_driver.py +++ b/congress/tests/datasources/test_mistral_driver.py @@ -16,8 +16,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock import sys +from unittest import mock sys.modules['mistralclient.api.v2.client'] = mock.Mock() sys.modules['mistralclient.api.v2'] = mock.Mock() diff --git a/congress/tests/datasources/test_monasca_driver.py b/congress/tests/datasources/test_monasca_driver.py index 3aff3f492..2a7662f38 100644 --- a/congress/tests/datasources/test_monasca_driver.py +++ b/congress/tests/datasources/test_monasca_driver.py @@ -14,9 +14,9 @@ # import copy -import mock import sys import time +from unittest import mock sys.modules['monascaclient.client'] = mock.Mock() sys.modules['monascaclient'] = mock.Mock() diff --git a/congress/tests/datasources/test_murano_driver.py b/congress/tests/datasources/test_murano_driver.py index 4c4c577c6..c3347864e 100644 --- a/congress/tests/datasources/test_murano_driver.py +++ b/congress/tests/datasources/test_murano_driver.py @@ -16,7 +16,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock # mocking muranoclient so that python-muranoclient # doesn't need to be included in requirements.txt. diff --git a/congress/tests/datasources/test_neutronv2_driver.py b/congress/tests/datasources/test_neutronv2_driver.py index 42c5f39c5..89cd66367 100644 --- a/congress/tests/datasources/test_neutronv2_driver.py +++ b/congress/tests/datasources/test_neutronv2_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import neutronv2_driver from congress.tests import base diff --git a/congress/tests/datasources/test_neutronv2_qos_driver.py b/congress/tests/datasources/test_neutronv2_qos_driver.py index 528db2b26..70f738397 100644 --- a/congress/tests/datasources/test_neutronv2_qos_driver.py +++ b/congress/tests/datasources/test_neutronv2_qos_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import neutronv2_qos_driver from congress.tests import base diff --git a/congress/tests/datasources/test_nova_driver.py b/congress/tests/datasources/test_nova_driver.py index 5136abbc5..8d4c0e448 100644 --- a/congress/tests/datasources/test_nova_driver.py +++ b/congress/tests/datasources/test_nova_driver.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + import novaclient from congress.datasources import nova_driver diff --git a/congress/tests/datasources/test_swift_driver.py b/congress/tests/datasources/test_swift_driver.py index f03d383b3..f52803e46 100644 --- a/congress/tests/datasources/test_swift_driver.py +++ b/congress/tests/datasources/test_swift_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import swift_driver from congress.tests import base diff --git a/congress/tests/datasources/test_tacker_driver.py b/congress/tests/datasources/test_tacker_driver.py index cdd75f537..c37601db8 100644 --- a/congress/tests/datasources/test_tacker_driver.py +++ b/congress/tests/datasources/test_tacker_driver.py @@ -17,7 +17,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import tacker_driver from congress.tests import base diff --git a/congress/tests/datasources/test_vCenter_driver.py b/congress/tests/datasources/test_vCenter_driver.py index 56782ce77..28d32053c 100644 --- a/congress/tests/datasources/test_vCenter_driver.py +++ b/congress/tests/datasources/test_vCenter_driver.py @@ -18,7 +18,7 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock from congress.datasources import vCenter_driver from congress.tests import base diff --git a/congress/tests/datasources/test_vitrage_driver.py b/congress/tests/datasources/test_vitrage_driver.py index 38cf53bfd..2db147ca3 100644 --- a/congress/tests/datasources/test_vitrage_driver.py +++ b/congress/tests/datasources/test_vitrage_driver.py @@ -19,8 +19,8 @@ from __future__ import absolute_import from datetime import datetime from datetime import timedelta -import mock import time +from unittest import mock from congress.datasources import vitrage_driver from congress.tests import base diff --git a/congress/tests/db/test_utils.py b/congress/tests/db/test_utils.py index e243627e6..ef7201fd2 100644 --- a/congress/tests/db/test_utils.py +++ b/congress/tests/db/test_utils.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + from oslo_db import exception as db_exc import testtools diff --git a/congress/tests/dse2/test_data_service.py b/congress/tests/dse2/test_data_service.py index 12a1ce4c2..87984e9c0 100644 --- a/congress/tests/dse2/test_data_service.py +++ b/congress/tests/dse2/test_data_service.py @@ -14,8 +14,8 @@ # import json -import mock import time +from unittest import mock from congress.dse2 import data_service from congress.tests import base diff --git a/congress/tests/dse2/test_datasource.py b/congress/tests/dse2/test_datasource.py index f9146deb8..1bfeab5e6 100644 --- a/congress/tests/dse2/test_datasource.py +++ b/congress/tests/dse2/test_datasource.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + from oslo_db import exception as db_exc from congress.db import datasources as datasource_db diff --git a/congress/tests/dse2/test_dse2.py b/congress/tests/dse2/test_dse2.py index c16a8d2a0..b03b9e780 100644 --- a/congress/tests/dse2/test_dse2.py +++ b/congress/tests/dse2/test_dse2.py @@ -13,9 +13,8 @@ # under the License. # -import mock -import tenacity import time +from unittest import mock # Note(ekcs): this is needed for direct unit test because Dse2Runtime import, # which takes place before the confFixture is setup, fails w/o it @@ -23,6 +22,7 @@ from novaclient import client as nova_client from oslo_config import cfg cfg.CONF.datasource_sync_period = 0 from oslo_messaging import conffixture +import tenacity from congress.api import base as api_base from congress.datalog import base as datalog_base diff --git a/congress/tests/dse2/test_dse_node.py b/congress/tests/dse2/test_dse_node.py index 5efd43096..0aeb44a33 100644 --- a/congress/tests/dse2/test_dse_node.py +++ b/congress/tests/dse2/test_dse_node.py @@ -13,17 +13,16 @@ # under the License. # -import eventlet -import mock +from unittest import mock +import eventlet from oslo_config import cfg from oslo_messaging import conffixture -from congress import exception - from congress.dse2 import data_service from congress.dse2 import datasource_manager as ds_manager from congress.dse2 import dse_node +from congress import exception from congress.tests.api import base as api_base from congress.tests import base from congress.tests import helper diff --git a/congress/tests/fake_datasource.py b/congress/tests/fake_datasource.py index f73754910..267145e09 100644 --- a/congress/tests/fake_datasource.py +++ b/congress/tests/fake_datasource.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + from oslo_log import log as logging from congress.datasources import datasource_driver diff --git a/congress/tests/haht/test.db b/congress/tests/haht/test.db new file mode 100644 index 000000000..8e92f21f9 Binary files /dev/null and b/congress/tests/haht/test.db differ diff --git a/congress/tests/policy_engines/test_agnostic.py b/congress/tests/policy_engines/test_agnostic.py index 4b2cb7b53..739e5a860 100644 --- a/congress/tests/policy_engines/test_agnostic.py +++ b/congress/tests/policy_engines/test_agnostic.py @@ -17,7 +17,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + from oslo_config import cfg from oslo_log import log as logging diff --git a/congress/tests/policy_engines/test_agnostic_dse2.py b/congress/tests/policy_engines/test_agnostic_dse2.py index e0eeaea68..4cf55a7d4 100644 --- a/congress/tests/policy_engines/test_agnostic_dse2.py +++ b/congress/tests/policy_engines/test_agnostic_dse2.py @@ -14,8 +14,7 @@ # import sys - -import mock +from unittest import mock from congress.api import base as api_base from congress.policy_engines import agnostic diff --git a/congress/tests/test_congress.py b/congress/tests/test_congress.py index 7b04c5db3..d4c4f2c0c 100644 --- a/congress/tests/test_congress.py +++ b/congress/tests/test_congress.py @@ -23,7 +23,8 @@ from __future__ import print_function from __future__ import division from __future__ import absolute_import -import mock +from unittest import mock + import neutronclient.v2_0 from oslo_log import log as logging diff --git a/congress/tests/test_server.py b/congress/tests/test_server.py index b2c690b5c..33e6d20ee 100644 --- a/congress/tests/test_server.py +++ b/congress/tests/test_server.py @@ -18,8 +18,8 @@ from __future__ import division from __future__ import absolute_import import socket +from unittest import mock -import mock from oslo_config import cfg import testtools diff --git a/congress/tests/z3/test_z3theory.py b/congress/tests/z3/test_z3theory.py index 863db9979..1d90b77cd 100644 --- a/congress/tests/z3/test_z3theory.py +++ b/congress/tests/z3/test_z3theory.py @@ -13,7 +13,8 @@ # under the License. """Unit tests for z3theory""" -import mock +from unittest import mock + import six from congress import data_types diff --git a/congress/tests/z3/test_z3types.py b/congress/tests/z3/test_z3types.py index 86f1941e1..78776c9d8 100644 --- a/congress/tests/z3/test_z3types.py +++ b/congress/tests/z3/test_z3types.py @@ -13,7 +13,7 @@ # under the License. """Unit tests for z3types""" -import mock +from unittest import mock from congress import data_types from congress import exception