From 1b2ea91420e297d51e66b985b8fb04c45059bd85 Mon Sep 17 00:00:00 2001 From: Huanxuan Ao Date: Fri, 15 Jul 2016 19:02:18 +0800 Subject: Use identity fake classes instead of old unit tests data Use FakeProject, FakeDomain and FakeUser classes instead of old test data in image, compute and volume. (This work has done in network) Change-Id: Ic37d5d9db98f0f2acc6c714a9646063dcbde4ff3 Partially-Implements: blueprint use-fake-project --- openstackclient/tests/image/v2/test_image.py | 114 +++++++++++---------------- 1 file changed, 46 insertions(+), 68 deletions(-) (limited to 'openstackclient/tests/image') diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py index c6b83bc5..d9cca8af 100644 --- a/openstackclient/tests/image/v2/test_image.py +++ b/openstackclient/tests/image/v2/test_image.py @@ -23,7 +23,6 @@ from osc_lib import exceptions from osc_lib import utils as common_utils from openstackclient.image.v2 import image -from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes from openstackclient.tests.image.v2 import fakes as image_fakes @@ -58,23 +57,18 @@ class TestImage(image_fakes.TestImagev2): class TestImageCreate(TestImage): + project = identity_fakes.FakeProject.create_one_project() + domain = identity_fakes.FakeDomain.create_one_domain() + def setUp(self): super(TestImageCreate, self).setUp() self.new_image = image_fakes.FakeImage.create_one_image() self.images_mock.create.return_value = self.new_image - self.project_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.PROJECT), - loaded=True, - ) + self.project_mock.get.return_value = self.project - self.domain_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.DOMAIN), - loaded=True, - ) + self.domain_mock.get.return_value = self.domain # This is the return value for utils.find_resource() self.images_mock.get.return_value = copy.deepcopy( @@ -145,7 +139,7 @@ class TestImageCreate(TestImage): ('--private' if self.new_image.visibility == 'private' else '--public'), '--project', self.new_image.owner, - '--project-domain', identity_fakes.domain_id, + '--project-domain', self.domain.id, self.new_image.name, ] verifylist = [ @@ -158,7 +152,7 @@ class TestImageCreate(TestImage): ('public', self.new_image.visibility == 'public'), ('private', self.new_image.visibility == 'private'), ('project', self.new_image.owner), - ('project_domain', identity_fakes.domain_id), + ('project_domain', self.domain.id), ('name', self.new_image.name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -175,7 +169,7 @@ class TestImageCreate(TestImage): disk_format='fs', min_disk=10, min_ram=4, - owner=identity_fakes.project_id, + owner=self.project.id, protected=self.new_image.protected, visibility=self.new_image.visibility, ) @@ -346,10 +340,12 @@ class TestImageCreate(TestImage): class TestAddProjectToImage(TestImage): + project = identity_fakes.FakeProject.create_one_project() + domain = identity_fakes.FakeDomain.create_one_domain() _image = image_fakes.FakeImage.create_one_image() new_member = image_fakes.FakeImage.create_one_image_member( attrs={'image_id': _image.id, - 'member_id': identity_fakes.project_id} + 'member_id': project.id} ) columns = ( @@ -360,8 +356,8 @@ class TestAddProjectToImage(TestImage): datalist = ( _image.id, - identity_fakes.project_id, - new_member.status + new_member.member_id, + new_member.status, ) def setUp(self): @@ -372,27 +368,19 @@ class TestAddProjectToImage(TestImage): # Update the image_id in the MEMBER dict self.image_members_mock.create.return_value = self.new_member - self.project_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.PROJECT), - loaded=True, - ) - self.domain_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.DOMAIN), - loaded=True, - ) + self.project_mock.get.return_value = self.project + self.domain_mock.get.return_value = self.domain # Get the command object to test self.cmd = image.AddProjectToImage(self.app, None) def test_add_project_to_image_no_option(self): arglist = [ self._image.id, - identity_fakes.project_id, + self.project.id, ] verifylist = [ ('image', self._image.id), - ('project', identity_fakes.project_id), + ('project', self.project.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -402,7 +390,7 @@ class TestAddProjectToImage(TestImage): columns, data = self.cmd.take_action(parsed_args) self.image_members_mock.create.assert_called_with( self._image.id, - identity_fakes.project_id + self.project.id ) self.assertEqual(self.columns, columns) @@ -411,13 +399,13 @@ class TestAddProjectToImage(TestImage): def test_add_project_to_image_with_option(self): arglist = [ self._image.id, - identity_fakes.project_id, - '--project-domain', identity_fakes.domain_id, + self.project.id, + '--project-domain', self.domain.id, ] verifylist = [ ('image', self._image.id), - ('project', identity_fakes.project_id), - ('project_domain', identity_fakes.domain_id), + ('project', self.project.id), + ('project_domain', self.domain.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -427,7 +415,7 @@ class TestAddProjectToImage(TestImage): columns, data = self.cmd.take_action(parsed_args) self.image_members_mock.create.assert_called_with( self._image.id, - identity_fakes.project_id + self.project.id ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -755,6 +743,9 @@ class TestImageList(TestImage): class TestRemoveProjectImage(TestImage): + project = identity_fakes.FakeProject.create_one_project() + domain = identity_fakes.FakeDomain.create_one_domain() + def setUp(self): super(TestRemoveProjectImage, self).setUp() @@ -762,16 +753,8 @@ class TestRemoveProjectImage(TestImage): # This is the return value for utils.find_resource() self.images_mock.get.return_value = self._image - self.project_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.PROJECT), - loaded=True, - ) - self.domain_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.DOMAIN), - loaded=True, - ) + self.project_mock.get.return_value = self.project + self.domain_mock.get.return_value = self.domain self.image_members_mock.delete.return_value = None # Get the command object to test self.cmd = image.RemoveProjectImage(self.app, None) @@ -779,11 +762,11 @@ class TestRemoveProjectImage(TestImage): def test_remove_project_image_no_options(self): arglist = [ self._image.id, - identity_fakes.project_id, + self.project.id, ] verifylist = [ ('image', self._image.id), - ('project', identity_fakes.project_id), + ('project', self.project.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -791,20 +774,20 @@ class TestRemoveProjectImage(TestImage): self.image_members_mock.delete.assert_called_with( self._image.id, - identity_fakes.project_id, + self.project.id, ) self.assertIsNone(result) def test_remove_project_image_with_options(self): arglist = [ self._image.id, - identity_fakes.project_id, - '--project-domain', identity_fakes.domain_id, + self.project.id, + '--project-domain', self.domain.id, ] verifylist = [ ('image', self._image.id), - ('project', identity_fakes.project_id), - ('project_domain', identity_fakes.domain_id), + ('project', self.project.id), + ('project_domain', self.domain.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -812,13 +795,16 @@ class TestRemoveProjectImage(TestImage): self.image_members_mock.delete.assert_called_with( self._image.id, - identity_fakes.project_id, + self.project.id, ) self.assertIsNone(result) class TestImageSet(TestImage): + project = identity_fakes.FakeProject.create_one_project() + domain = identity_fakes.FakeDomain.create_one_domain() + def setUp(self): super(TestImageSet, self).setUp() # Set up the schema @@ -827,17 +813,9 @@ class TestImageSet(TestImage): schemas.SchemaBasedModel, ) - self.project_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.PROJECT), - loaded=True, - ) + self.project_mock.get.return_value = self.project - self.domain_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.DOMAIN), - loaded=True, - ) + self.domain_mock.get.return_value = self.domain self.images_mock.get.return_value = self.model(**image_fakes.IMAGE) self.images_mock.update.return_value = self.model(**image_fakes.IMAGE) @@ -864,8 +842,8 @@ class TestImageSet(TestImage): '--min-ram', '4', '--container-format', 'ovf', '--disk-format', 'vmdk', - '--project', identity_fakes.project_name, - '--project-domain', identity_fakes.domain_id, + '--project', self.project.name, + '--project-domain', self.domain.id, image_fakes.image_id, ] verifylist = [ @@ -874,8 +852,8 @@ class TestImageSet(TestImage): ('min_ram', 4), ('container_format', 'ovf'), ('disk_format', 'vmdk'), - ('project', identity_fakes.project_name), - ('project_domain', identity_fakes.domain_id), + ('project', self.project.name), + ('project_domain', self.domain.id), ('image', image_fakes.image_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -884,7 +862,7 @@ class TestImageSet(TestImage): kwargs = { 'name': 'new-name', - 'owner': identity_fakes.project_id, + 'owner': self.project.id, 'min_disk': 2, 'min_ram': 4, 'container_format': 'ovf', -- cgit v1.2.1