openstack/python-openstackclient
Code Issues Proposed changes

Merge "tests: Simplify mocking in image tests"

Browse Source
This commit is contained in:
Zuul
2025-05-19 16:25:49 +00:00
committed by Gerrit Code Review
parent 50dd542519 444a1df705
commit 5fb4559a1f
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
openstackclient/tests/unit/image/v1/test_image.py
View File

@@ -54,9 +54,9 @@ class TestImageCreate(image_fakes.TestImagev1):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.image_client.create_image = mock.Mock(return_value=self.new_image) self.image_client.create_image.return_value = self.new_image
self.image_client.find_image = mock.Mock(return_value=self.new_image) self.image_client.find_image.return_value = self.new_image
self.image_client.update_image = mock.Mock(return_image=self.new_image) self.image_client.update_image.return_value = self.new_image
# Get the command object to test # Get the command object to test
self.cmd = image.CreateImage(self.app, None) self.cmd = image.CreateImage(self.app, None)
@@ -212,8 +212,8 @@ class TestImageDelete(image_fakes.TestImagev1):
super().setUp() super().setUp()
# This is the return value for utils.find_resource() # This is the return value for utils.find_resource()
self.image_client.find_image = mock.Mock(return_value=self._image) self.image_client.find_image.return_value = self._image
self.image_client.delete_image = mock.Mock(return_value=None) self.image_client.delete_image.return_value = None
# Get the command object to test # Get the command object to test
self.cmd = image.DeleteImage(self.app, None) self.cmd = image.DeleteImage(self.app, None)
@@ -261,7 +261,6 @@ class TestImageList(image_fakes.TestImagev1):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.image_client.images = mock.Mock()
self.image_client.images.side_effect = [ self.image_client.images.side_effect = [
[self._image], [self._image],
[], [],
@@ -441,8 +440,8 @@ class TestImageSet(image_fakes.TestImagev1):
super().setUp() super().setUp()
# This is the return value for utils.find_resource() # This is the return value for utils.find_resource()
self.image_client.find_image = mock.Mock(return_value=self._image) self.image_client.find_image.return_value = self._image
self.image_client.update_image = mock.Mock(return_value=self._image) self.image_client.update_image.return_value = self._image
# Get the command object to test # Get the command object to test
self.cmd = image.SetImage(self.app, None) self.cmd = image.SetImage(self.app, None)
@@ -712,7 +711,7 @@ class TestImageShow(image_fakes.TestImagev1):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.image_client.find_image = mock.Mock(return_value=self._image) self.image_client.find_image.return_value = self._image
# Get the command object to test # Get the command object to test
self.cmd = image.ShowImage(self.app, None) self.cmd = image.ShowImage(self.app, None)

6
openstackclient/tests/unit/image/v2/test_image.py
View File

@@ -914,7 +914,7 @@ class TestImageList(TestImage):
self.assertEqual(ret_limit, len(tuple(data))) self.assertEqual(ret_limit, len(tuple(data)))
def test_image_list_project_option(self): def test_image_list_project_option(self):
self.image_client.find_image = mock.Mock(return_value=self._image) self.image_client.find_image.return_value = self._image
arglist = [ arglist = [
'--project', '--project',
'nova', 'nova',
@@ -931,7 +931,7 @@ class TestImageList(TestImage):
@mock.patch('osc_lib.utils.find_resource') @mock.patch('osc_lib.utils.find_resource')
def test_image_list_marker_option(self, fr_mock): def test_image_list_marker_option(self, fr_mock):
self.image_client.find_image = mock.Mock(return_value=self._image) self.image_client.find_image.return_value = self._image
arglist = [ arglist = [
'--marker', '--marker',
@@ -1721,7 +1721,7 @@ class TestImageShow(TestImage):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.image_client.find_image = mock.Mock(return_value=self._data) self.image_client.find_image.return_value = self._data
# Get the command object to test # Get the command object to test
self.cmd = _image.ShowImage(self.app, None) self.cmd = _image.ShowImage(self.app, None)