openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestRemoveProjectImage with FakeImage class"

Browse Source
This commit is contained in:
Jenkins 2016-05-16 22:51:21 +00:00 committed by Gerrit Code Review
commit f0e64eb55a
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openstackclient/tests/image/v2/test_image.py
View File

@ -727,12 +727,10 @@ class TestRemoveProjectImage(TestImage):
def setUp(self): def setUp(self):
super(TestRemoveProjectImage, self).setUp() super(TestRemoveProjectImage, self).setUp()
self._image = image_fakes.FakeImage.create_one_image()
# This is the return value for utils.find_resource() # This is the return value for utils.find_resource()
self.images_mock.get.return_value = fakes.FakeResource( self.images_mock.get.return_value = self._image
None,
copy.deepcopy(image_fakes.IMAGE),
loaded=True,
)
self.project_mock.get.return_value = fakes.FakeResource( self.project_mock.get.return_value = fakes.FakeResource(
None, None,
copy.deepcopy(identity_fakes.PROJECT), copy.deepcopy(identity_fakes.PROJECT),
@ -749,11 +747,11 @@ class TestRemoveProjectImage(TestImage):
def test_remove_project_image_no_options(self): def test_remove_project_image_no_options(self):
arglist = [ arglist = [
image_fakes.image_id, self._image.id,
identity_fakes.project_id, identity_fakes.project_id,
] ]
verifylist = [ verifylist = [
('image', image_fakes.image_id), ('image', self._image.id),
('project', identity_fakes.project_id), ('project', identity_fakes.project_id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -761,19 +759,19 @@ class TestRemoveProjectImage(TestImage):
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with( self.image_members_mock.delete.assert_called_with(
image_fakes.image_id, self._image.id,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertIsNone(result) self.assertIsNone(result)
def test_remove_project_image_with_options(self): def test_remove_project_image_with_options(self):
arglist = [ arglist = [
image_fakes.image_id, self._image.id,
identity_fakes.project_id, identity_fakes.project_id,
'--project-domain', identity_fakes.domain_id, '--project-domain', identity_fakes.domain_id,
] ]
verifylist = [ verifylist = [
('image', image_fakes.image_id), ('image', self._image.id),
('project', identity_fakes.project_id), ('project', identity_fakes.project_id),
('project_domain', identity_fakes.domain_id), ('project_domain', identity_fakes.domain_id),
] ]
@ -782,7 +780,7 @@ class TestRemoveProjectImage(TestImage):
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with( self.image_members_mock.delete.assert_called_with(
image_fakes.image_id, self._image.id,
identity_fakes.project_id, identity_fakes.project_id,
) )
self.assertIsNone(result) self.assertIsNone(result)