From 69be96ae724cbc8dffe4919755c98e08721af1cd Mon Sep 17 00:00:00 2001
From: ting wang <bx_wang@outlook.com>
Date: Mon, 16 May 2016 13:02:44 +0800
Subject: [PATCH] Refactor TestRemoveProjectImage with FakeImage class
Change-Id: Id40ea8a3cf59738fa254da0bca4ad6551565f5de
Co-Authored-By: xiexs <xiexs@cn.fujitsu.com>
Implements: blueprint improve-image-unittest-framework
---
openstackclient/tests/image/v2/test_image.py | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index 67b86d111a..33f2533105 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -727,12 +727,10 @@ class TestRemoveProjectImage(TestImage):
def setUp(self):
super(TestRemoveProjectImage, self).setUp()
+ self._image = image_fakes.FakeImage.create_one_image()
# This is the return value for utils.find_resource()
- self.images_mock.get.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(image_fakes.IMAGE),
- loaded=True,
- )
+ self.images_mock.get.return_value = self._image
+
self.project_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes.PROJECT),
@@ -749,11 +747,11 @@ class TestRemoveProjectImage(TestImage):
def test_remove_project_image_no_options(self):
arglist = [
- image_fakes.image_id,
+ self._image.id,
identity_fakes.project_id,
]
verifylist = [
- ('image', image_fakes.image_id),
+ ('image', self._image.id),
('project', identity_fakes.project_id),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -761,19 +759,19 @@ class TestRemoveProjectImage(TestImage):
result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with(
- image_fakes.image_id,
+ self._image.id,
identity_fakes.project_id,
)
self.assertIsNone(result)
def test_remove_project_image_with_options(self):
arglist = [
- image_fakes.image_id,
+ self._image.id,
identity_fakes.project_id,
'--project-domain', identity_fakes.domain_id,
]
verifylist = [
- ('image', image_fakes.image_id),
+ ('image', self._image.id),
('project', identity_fakes.project_id),
('project_domain', identity_fakes.domain_id),
]
@@ -782,7 +780,7 @@ class TestRemoveProjectImage(TestImage):
result = self.cmd.take_action(parsed_args)
self.image_members_mock.delete.assert_called_with(
- image_fakes.image_id,
+ self._image.id,
identity_fakes.project_id,
)
self.assertIsNone(result)