openstack/octavia
Code Issues Proposed changes

Remove the dependency on the "mock" package

Browse Source 
Now that we are python3 only, we should move to using the built
in version of mock that supports all of our testing needs and
remove the dependency on the "mock" package.

This patch moves all references to "import mock" to
"from unittest import mock". It also cleans up some new line
inconsistency.

Change-Id: I72520a2ca010c2c27315d9dff839a4f9d7540b6b
This commit is contained in:
Michael Johnson 2020-02-17 14:23:29 -08:00
parent bb0efa2a5d
commit 49036845c1
107 changed files with 111 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia/tests/common/utils.py
View File

@ -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
# Borrowed from neutron

2
octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py
View File

@ -15,9 +15,9 @@
import os
import stat
import subprocess
from unittest import mock
import flask
import mock
from oslo_utils import uuidutils

2
octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py
View File

@ -18,9 +18,9 @@ import random
import socket
import stat
import subprocess
from unittest import mock
import fixtures
import mock
from oslo_config import fixture as oslo_fixture
from oslo_serialization import jsonutils
from oslo_utils import uuidutils

3
octavia/tests/functional/api/v2/base.py
View File

@ -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 cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/functional/api/v2/test_amphora.py
View File

@ -13,8 +13,8 @@
# under the License.
import datetime
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/functional/api/v2/test_availability_zone_profiles.py
View File

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

2
octavia/tests/functional/api/v2/test_availability_zones.py
View File

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

2
octavia/tests/functional/api/v2/test_flavor_profiles.py
View File

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

2
octavia/tests/functional/api/v2/test_flavors.py
View File

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

2
octavia/tests/functional/api/v2/test_health_monitor.py
View File

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

2
octavia/tests/functional/api/v2/test_l7policy.py
View File

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

2
octavia/tests/functional/api/v2/test_l7rule.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/functional/api/v2/test_listener.py
View File

@ -15,8 +15,8 @@
import copy
import random
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/functional/api/v2/test_load_balancer.py
View File

@ -14,8 +14,8 @@
import copy
import random
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/functional/api/v2/test_member.py
View File

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia_lib.api.drivers import data_models as driver_dm
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/functional/api/v2/test_pool.py
View File

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

2
octavia/tests/functional/api/v2/test_provider.py
View File

@ -13,7 +13,7 @@
# under the License.
import mock
from unittest import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/functional/api/v2/test_quotas.py
View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import random
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/functional/db/test_repositories.py
View File

@ -15,8 +15,8 @@
import copy
import datetime
import random
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_db import exception as db_exception

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py
View File

@ -11,10 +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.
import random
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.amphorae.backends.agent import api_server

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_haproxy_compatibility.py
View File

@ -11,8 +11,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 octavia.amphorae.backends.agent.api_server import haproxy_compatibility
from octavia.common import constants

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py
View File

@ -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.
import subprocess
from unittest import mock
import flask
import mock
from octavia.amphorae.backends.agent.api_server import keepalived
import octavia.tests.unit.base as base

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py
View File

@ -11,8 +11,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 oslo_utils import uuidutils

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py
View File

@ -11,10 +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.
import subprocess
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.amphorae.backends.agent.api_server import loadbalancer

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py
View File

@ -11,12 +11,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.
import ipaddress
import os
import shutil
from unittest import mock
import mock
from oslo_config import fixture as oslo_fixture
from octavia.amphorae.backends.agent.api_server import osutils

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py
View File

@ -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.
import os
import subprocess
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from werkzeug import exceptions as wz_exceptions

3
octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py
View File

@ -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.
import os
import subprocess
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py
View File

@ -11,12 +11,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.
import binascii
import random
import socket
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

3
octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py
View File

@ -11,10 +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.
import socket
from unittest import mock
import mock
import six
from octavia.amphorae.backends.utils import haproxy_query as query

2
octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py
View File

@ -9,8 +9,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.
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.amphorae.backends.agent.api_server import util

3
octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_0_5.py
View File

@ -12,10 +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.
import hashlib
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py
View File

@ -12,10 +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.
import hashlib
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py
View File

@ -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.
import binascii
import random
import socket
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

3
octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py
View File

@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import copy
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/unit/amphorae/drivers/keepalived/test_vrrp_rest_driver.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.amphorae.drivers.keepalived import vrrp_rest_driver

2
octavia/tests/unit/amphorae/drivers/test_noop_amphoraloadbalancer_driver.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.amphorae.drivers.noop_driver import driver

2
octavia/tests/unit/api/drivers/amphora_driver/v1/test_amphora_driver.py
View File

@ -11,7 +11,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 octavia_lib.api.drivers import data_models as driver_dm
from octavia_lib.api.drivers import exceptions

2
octavia/tests/unit/api/drivers/amphora_driver/v2/test_amphora_driver.py
View File

@ -11,7 +11,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 octavia_lib.api.drivers import data_models as driver_dm
from octavia_lib.api.drivers import exceptions

2
octavia/tests/unit/api/drivers/driver_agent/test_driver_get.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia_lib.common import constants as lib_consts
from oslo_utils import uuidutils

4
octavia/tests/unit/api/drivers/driver_agent/test_driver_listener.py
View File

@ -11,10 +11,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 errno
import mock
from unittest import mock
from oslo_config import cfg
from oslo_serialization import jsonutils

3
octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py
View File

@ -11,10 +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.
import copy
from unittest import mock
import mock
from mock import call
from octavia.api.drivers.driver_agent import driver_updater

2
octavia/tests/unit/api/drivers/test_driver_factory.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.api.drivers import driver_factory
from octavia.common import exceptions

2
octavia/tests/unit/api/drivers/test_driver_lib.py
View File

@ -26,7 +26,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
import octavia_lib.api.drivers.driver_lib as lib_driver_lib

2
octavia/tests/unit/api/drivers/test_provider_noop_agent.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.api.drivers.noop_driver import agent
import octavia.tests.unit.base as base

4
octavia/tests/unit/api/drivers/test_utils.py
View File

@ -11,10 +11,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 copy
import mock
from unittest import mock
from octavia_lib.api.drivers import data_models as driver_dm
from octavia_lib.api.drivers import exceptions as lib_exceptions

2
octavia/tests/unit/api/hooks/test_query_parameters.py
View File

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

3
octavia/tests/unit/base.py
View File

@ -11,8 +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 oslo_config import cfg
import oslo_messaging as messaging
from oslo_messaging import conffixture as messaging_conffixture

2
octavia/tests/unit/certificates/common/auth/test_barbican_acl.py
View File

@ -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
from barbicanclient.v1 import acls
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/unit/certificates/common/test_barbican.py
View File

@ -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
from barbicanclient.v1 import containers
from barbicanclient.v1 import secrets
import mock
import six
import octavia.certificates.common.barbican as barbican_common

2
octavia/tests/unit/certificates/generator/local_csr.py
View File

@ -11,13 +11,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.
from unittest import mock
from cryptography.hazmat import backends
from cryptography.hazmat.primitives.asymmetric import rsa
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives import serialization
from cryptography import x509
import mock
import octavia.tests.unit.base as base

3
octavia/tests/unit/certificates/manager/test_barbican.py
View File

@ -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.
from unittest import mock
import uuid
from barbicanclient.v1 import secrets
import mock
from OpenSSL import crypto
import octavia.certificates.common.barbican as barbican_common

2
octavia/tests/unit/certificates/manager/test_barbican_legacy.py
View File

@ -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
from barbicanclient.v1 import containers
from barbicanclient.v1 import secrets
import mock
from oslo_utils import uuidutils
import six

2
octavia/tests/unit/certificates/manager/test_castellan_mgr.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.certificates.manager import castellan_mgr
from octavia.common import exceptions

2
octavia/tests/unit/certificates/manager/test_local.py
View File

@ -14,8 +14,8 @@
import os
import stat
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/cmd/test_agent.py
View File

@ -10,8 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import ssl
import mock
from unittest import mock
from octavia.cmd import agent
from octavia.tests.unit import base

3
octavia/tests/unit/cmd/test_driver_agent.py
View File

@ -11,10 +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.
import signal
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/unit/cmd/test_haproxy_vrrp_check.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.cmd import haproxy_vrrp_check
from octavia.tests.unit import base

4
octavia/tests/unit/cmd/test_health_manager.py
View File

@ -11,10 +11,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 signal
import mock
from unittest import mock
from octavia.cmd import health_manager
from octavia.tests.unit import base

2
octavia/tests/unit/cmd/test_house_keeping.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.cmd import house_keeping
from octavia.tests.unit import base

3
octavia/tests/unit/common/test_base_taskflow.py
View File

@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import concurrent.futures
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from taskflow import engines as tf_engines

2
octavia/tests/unit/common/test_clients.py
View File

@ -9,10 +9,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 cinderclient.v3
import glanceclient.v2
import mock
import neutronclient.v2_0
import novaclient.v2
from oslo_config import cfg

3
octavia/tests/unit/common/test_stats.py
View File

@ -11,10 +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.
import random
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.common import constants

2
octavia/tests/unit/common/test_validations.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/common/tls_utils/test_cert_parser.py
View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import datetime
from unittest import mock
from cryptography import x509
import mock
from octavia.common import data_models
import octavia.common.exceptions as exceptions

2
octavia/tests/unit/compute/drivers/test_nova_driver.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from novaclient import exceptions as nova_exceptions
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

2
octavia/tests/unit/controller/healthmanager/health_drivers/test_update_db.py
View File

@ -14,8 +14,8 @@
import random
import time
from unittest import mock
import mock
from oslo_config import cfg
from oslo_utils import uuidutils
import six

2
octavia/tests/unit/controller/healthmanager/health_drivers/test_update_logging.py
View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import mock
from unittest import mock
from octavia.controller.healthmanager.health_drivers import update_logging
from octavia.tests.unit import base

4
octavia/tests/unit/controller/healthmanager/test_health_manager.py
View File

@ -11,10 +11,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 threading
import mock
from unittest import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture

3
octavia/tests/unit/controller/housekeeping/test_house_keeping.py
View File

@ -11,10 +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.
import datetime
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/queue/v1/test_consumer.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
import oslo_messaging as messaging

2
octavia/tests/unit/controller/queue/v1/test_endpoints.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/queue/v2/test_consumer.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
import oslo_messaging as messaging

2
octavia/tests/unit/controller/queue/v2/test_endpoints.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/worker/test_amphora_rate_limit.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/worker/test_task_utils.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from taskflow.patterns import linear_flow as flow

3
octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py
View File

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import mock
from unittest import mock
from taskflow.patterns import linear_flow as flow
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from taskflow.patterns import linear_flow as flow

2
octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from taskflow.patterns import linear_flow as flow
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/controller/worker/v1/tasks/test_cert_task.py
View File

@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from octavia.certificates.common import local

2
octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py
View File

@ -12,11 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import random
from unittest import mock
from cryptography import fernet
import mock
from oslo_db import exception as odb_exceptions
from oslo_utils import uuidutils
from sqlalchemy.orm import exc

2
octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_utils import uuidutils
from taskflow.types import failure

2
octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.controller.worker.v1.tasks import lifecycle_tasks

2
octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py
View File

@ -13,7 +13,7 @@
# under the License.
#
import mock
from unittest import mock
from octavia.controller.worker.v1.tasks import model_tasks
import octavia.tests.unit.base as base

2
octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/worker/v1/test_controller_worker.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

2
octavia/tests/unit/controller/worker/v2/flows/test_amphora_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from taskflow.patterns import linear_flow as flow

3
octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py
View File

@ -12,7 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import mock
from unittest import mock
from taskflow.patterns import linear_flow as flow
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from taskflow.patterns import linear_flow as flow

2
octavia/tests/unit/controller/worker/v2/flows/test_member_flows.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from taskflow.patterns import linear_flow as flow
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/controller/worker/v2/tasks/test_cert_task.py
View File

@ -12,10 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from octavia.certificates.common import local

2
octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py
View File

@ -12,9 +12,9 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
from cryptography import fernet
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

3
octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py
View File

@ -12,11 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import random
from unittest import mock
from cryptography import fernet
import mock
from oslo_db import exception as odb_exceptions
from oslo_utils import uuidutils
from sqlalchemy.orm import exc

2
octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_utils import uuidutils
from taskflow.types import failure

2
octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py
View File

@ -11,8 +11,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.
from unittest import mock
import mock
from oslo_utils import uuidutils
from octavia.common import constants

2
octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py
View File

@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
#
from unittest import mock
import mock
from oslo_config import cfg
from oslo_config import fixture as oslo_fixture
from oslo_utils import uuidutils

Some files were not shown because too many files have changed in this diff Show More