openstack/nova
Code Issues Proposed changes

Merge "tests: Replace keystoneclient with keystoneauth1"

Browse Source
This commit is contained in:
Zuul
2025-10-02 12:07:49 +00:00
committed by Gerrit Code Review
parent 1508cb39a2 602e07053b
commit e8ebbd5417
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/compute/test_compute.py
View File

@@ -28,7 +28,7 @@ from castellan import key_manager
from cinderclient import exceptions as cinder_exception from cinderclient import exceptions as cinder_exception
import ddt import ddt
import futurist 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 neutronclient.common import exceptions as neutron_exceptions
from oslo_log import log as logging from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging

2
nova/tests/unit/scheduler/test_manager.py
View File

@@ -1767,7 +1767,7 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
@mock.patch('nova.rpc.get_notifier') @mock.patch('nova.rpc.get_notifier')
def test_init_lazy_placement_client_failures(self, mock_rpc, mock_sg, def test_init_lazy_placement_client_failures(self, mock_rpc, mock_sg,
mock_hm, mock_report): mock_hm, mock_report):
# Certain keystoneclient exceptions are fatal # Certain keystoneauth1 exceptions are fatal
mock_report.side_effect = ks_exc.Unauthorized mock_report.side_effect = ks_exc.Unauthorized
self.assertRaises(ks_exc.Unauthorized, manager.SchedulerManager) self.assertRaises(ks_exc.Unauthorized, manager.SchedulerManager)

2
nova/tests/unit/volume/test_cinder.py
View File

@@ -18,9 +18,9 @@ from unittest import mock
from cinderclient import api_versions as cinder_api_versions from cinderclient import api_versions as cinder_api_versions
from cinderclient import exceptions as cinder_exception from cinderclient import exceptions as cinder_exception
from cinderclient.v3 import limits as cinder_limits 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 loading as ks_loading
from keystoneauth1 import session from keystoneauth1 import session
from keystoneclient import exceptions as keystone_exception
from oslo_utils.fixture import uuidsentinel as uuids from oslo_utils.fixture import uuidsentinel as uuids
from oslo_utils import timeutils from oslo_utils import timeutils