openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestAddProjectToImage with FakeImage class"

Browse Source
This commit is contained in:
Jenkins 2016-05-16 22:46:02 +00:00 committed by Gerrit Code Review
commit 91fcca271e
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,28 +341,31 @@ class TestImageCreate(TestImage):
class TestAddProjectToImage(TestImage): class TestAddProjectToImage(TestImage):
_image = image_fakes.FakeImage.create_one_image()
columns = ( columns = (
'image_id', 'image_id',
'member_id', 'member_id',
'status', 'status',
) )
datalist = ( datalist = (
image_fakes.image_id, _image.id,
identity_fakes.project_id, identity_fakes.project_id,
image_fakes.member_status, image_fakes.member_status
) )
def setUp(self): def setUp(self):
super(TestAddProjectToImage, self).setUp() super(TestAddProjectToImage, self).setUp()
# 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), # Update the image_id in the MEMBER dict
loaded=True, self.new_member = copy.deepcopy(image_fakes.MEMBER)
) self.new_member['image_id'] = self._image.id
self.image_members_mock.create.return_value = fakes.FakeModel( self.image_members_mock.create.return_value = fakes.FakeModel(
copy.deepcopy(image_fakes.MEMBER), self.new_member,
) )
self.project_mock.get.return_value = fakes.FakeResource( self.project_mock.get.return_value = fakes.FakeResource(
None, None,
@ -379,11 +382,11 @@ class TestAddProjectToImage(TestImage):
def test_add_project_to_image_no_option(self): def test_add_project_to_image_no_option(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)
@ -393,20 +396,21 @@ class TestAddProjectToImage(TestImage):
# data to be shown. # data to be shown.
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.image_members_mock.create.assert_called_with( self.image_members_mock.create.assert_called_with(
image_fakes.image_id, self._image.id,
identity_fakes.project_id identity_fakes.project_id
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)
self.assertEqual(self.datalist, data) self.assertEqual(self.datalist, data)
def test_add_project_to_image_with_option(self): def test_add_project_to_image_with_option(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),
] ]
@ -417,7 +421,7 @@ class TestAddProjectToImage(TestImage):
# data to be shown. # data to be shown.
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.image_members_mock.create.assert_called_with( self.image_members_mock.create.assert_called_with(
image_fakes.image_id, self._image.id,
identity_fakes.project_id identity_fakes.project_id
) )
self.assertEqual(self.columns, columns) self.assertEqual(self.columns, columns)