openstack/cinder
Code Issues Proposed changes

Merge "Stop testing old release of cinder"

Browse Source
This commit is contained in:
Zuul 2025-02-10 14:53:26 +00:00 committed by Gerrit Code Review
commit d6e99d69ae
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cinder/tests/unit/volume/drivers/test_datera.py
View File

@ -20,7 +20,6 @@ import uuid
from cinder import context
from cinder import exception
from cinder.tests.unit import test
from cinder import version
from cinder.volume import configuration as conf
from cinder.volume import volume_types
@ -430,21 +429,13 @@ class DateraVolumeTestCasev22(test.TestCase):
offset = mock.MagicMock()
sort_keys = mock.MagicMock()
sort_dirs = mock.MagicMock()
if (version.version_string() >= '15.0.0'):
with mock.patch(
'cinder.volume.volume_utils.paginate_entries_list') \
as mpage:
self.driver.get_manageable_volumes(
[testvol], marker, limit, offset, sort_keys, sort_dirs)
mpage.assert_called_once_with(
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
else:
with mock.patch(
'cinder.volume.utils.paginate_entries_list') as mpage:
self.driver.get_manageable_volumes(
[testvol], marker, limit, offset, sort_keys, sort_dirs)
mpage.assert_called_once_with(
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
with mock.patch(
'cinder.volume.volume_utils.paginate_entries_list') \
as mpage:
self.driver.get_manageable_volumes(
[testvol], marker, limit, offset, sort_keys, sort_dirs)
mpage.assert_called_once_with(
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
def test_unmanage(self):
testvol = _stub_volume()