Skip to content

Commit e95a374

Browse files
arnaudmorinpriteau
authored andcommitted
Stop testing old release of cinder
A test in datera was failing locally due to the fact the the version checking could be wrong in the egg-info local folder if you switch from a branch to another. It's not necessary to test this anymore as Cinder version 15 (train) is EOL anyway. Signed-off-by: Arnaud Morin <arnaud.morin@ovhcloud.com> Change-Id: I0d17899c0b239ec969ff51238dcbd4402a567f6c (cherry picked from commit 7ee7ac5) (cherry picked from commit e70f1a8) (cherry picked from commit b2298e1)
1 parent 1c00d64 commit e95a374

1 file changed

Lines changed: 7 additions & 16 deletions

File tree

cinder/tests/unit/volume/drivers/test_datera.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from cinder import context
2121
from cinder import exception
2222
from cinder.tests.unit import test
23-
from cinder import version
2423
from cinder.volume import configuration as conf
2524
from cinder.volume import volume_types
2625

@@ -430,21 +429,13 @@ def test_get_manageable_volumes(self):
430429
offset = mock.MagicMock()
431430
sort_keys = mock.MagicMock()
432431
sort_dirs = mock.MagicMock()
433-
if (version.version_string() >= '15.0.0'):
434-
with mock.patch(
435-
'cinder.volume.volume_utils.paginate_entries_list') \
436-
as mpage:
437-
self.driver.get_manageable_volumes(
438-
[testvol], marker, limit, offset, sort_keys, sort_dirs)
439-
mpage.assert_called_once_with(
440-
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
441-
else:
442-
with mock.patch(
443-
'cinder.volume.utils.paginate_entries_list') as mpage:
444-
self.driver.get_manageable_volumes(
445-
[testvol], marker, limit, offset, sort_keys, sort_dirs)
446-
mpage.assert_called_once_with(
447-
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
432+
with mock.patch(
433+
'cinder.volume.volume_utils.paginate_entries_list') \
434+
as mpage:
435+
self.driver.get_manageable_volumes(
436+
[testvol], marker, limit, offset, sort_keys, sort_dirs)
437+
mpage.assert_called_once_with(
438+
[v1, v2], marker, limit, offset, sort_keys, sort_dirs)
448439

449440
def test_unmanage(self):
450441
testvol = _stub_volume()

0 commit comments

Comments
 (0)