From 602e07053b41453e594ae0509b48367ad925e026 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 5 Aug 2025 10:26:51 +0100 Subject: [PATCH] tests: Replace keystoneclient with keystoneauth1 This was only working because the keystoneclient exceptions are aliases of the keystoneauth1 exceptions, and keystoneclient is coming in as a transitive dependency of python-neutronclient and keystonemiddleware. Change-Id: I51ff34ae6abc7ffe768fc43f736a9bfde3b48496 Signed-off-by: Stephen Finucane --- nova/tests/unit/compute/test_compute.py | 2 +- nova/tests/unit/scheduler/test_manager.py | 2 +- nova/tests/unit/volume/test_cinder.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py index 85ff6ae899e3..639f16874db7 100644 --- a/nova/tests/unit/compute/test_compute.py +++ b/nova/tests/unit/compute/test_compute.py @@ -28,7 +28,7 @@ from castellan import key_manager from cinderclient import exceptions as cinder_exception import ddt import futurist -from keystoneclient import exceptions as keystone_exception +from keystoneauth1 import exceptions as keystone_exception from neutronclient.common import exceptions as neutron_exceptions from oslo_log import log as logging import oslo_messaging as messaging diff --git a/nova/tests/unit/scheduler/test_manager.py b/nova/tests/unit/scheduler/test_manager.py index 885fe51ec284..f80e53d66af2 100644 --- a/nova/tests/unit/scheduler/test_manager.py +++ b/nova/tests/unit/scheduler/test_manager.py @@ -1767,7 +1767,7 @@ class SchedulerManagerTestCase(test.NoDBTestCase): @mock.patch('nova.rpc.get_notifier') def test_init_lazy_placement_client_failures(self, mock_rpc, mock_sg, mock_hm, mock_report): - # Certain keystoneclient exceptions are fatal + # Certain keystoneauth1 exceptions are fatal mock_report.side_effect = ks_exc.Unauthorized self.assertRaises(ks_exc.Unauthorized, manager.SchedulerManager) diff --git a/nova/tests/unit/volume/test_cinder.py b/nova/tests/unit/volume/test_cinder.py index 64966cb327ff..8005133441a9 100644 --- a/nova/tests/unit/volume/test_cinder.py +++ b/nova/tests/unit/volume/test_cinder.py @@ -18,9 +18,9 @@ from unittest import mock from cinderclient import api_versions as cinder_api_versions from cinderclient import exceptions as cinder_exception from cinderclient.v3 import limits as cinder_limits +from keystoneauth1 import exceptions as keystone_exception from keystoneauth1 import loading as ks_loading from keystoneauth1 import session -from keystoneclient import exceptions as keystone_exception from oslo_utils.fixture import uuidsentinel as uuids from oslo_utils import timeutils