diff --git a/ovn_octavia_provider/tests/functional/test_driver.py b/ovn_octavia_provider/tests/functional/test_driver.py index 8c405c2e..233e1cd0 100644 --- a/ovn_octavia_provider/tests/functional/test_driver.py +++ b/ovn_octavia_provider/tests/functional/test_driver.py @@ -15,9 +15,10 @@ import atexit import copy -import multiprocessing as mp -import mock +import multiprocessing as mp +from unittest import mock + from neutron.common import utils as n_utils from neutron_lib.plugins import directory from octavia_lib.api.drivers import data_models as octavia_data_model @@ -288,7 +289,7 @@ class TestOvnOctaviaBase( # 'provisioning_status': 'ACTIVE'}]}, updated_statuses = [] for call in update_loadbalancer_status.mock_calls: - updated_statuses.append(call.args[0]) + updated_statuses.append(call[1][0]) calls_found = [] for expected_status in expected_statuses: for updated_status in updated_statuses: diff --git a/ovn_octavia_provider/tests/unit/common/test_clients.py b/ovn_octavia_provider/tests/unit/common/test_clients.py index ded72e29..9aee4e2e 100644 --- a/ovn_octavia_provider/tests/unit/common/test_clients.py +++ b/ovn_octavia_provider/tests/unit/common/test_clients.py @@ -11,7 +11,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/ovn_octavia_provider/tests/unit/fakes.py b/ovn_octavia_provider/tests/unit/fakes.py index 5841aa1a..609c1828 100644 --- a/ovn_octavia_provider/tests/unit/fakes.py +++ b/ovn_octavia_provider/tests/unit/fakes.py @@ -13,8 +13,8 @@ # import copy +from unittest import mock -import mock from oslo_utils import uuidutils from ovn_octavia_provider.common import constants diff --git a/ovn_octavia_provider/tests/unit/test_driver.py b/ovn_octavia_provider/tests/unit/test_driver.py index 10e041e2..5d0545e2 100644 --- a/ovn_octavia_provider/tests/unit/test_driver.py +++ b/ovn_octavia_provider/tests/unit/test_driver.py @@ -13,8 +13,8 @@ # import copy import os +from unittest import mock -import mock from neutron.tests import base from neutronclient.common import exceptions as n_exc from octavia_lib.api.drivers import data_models