From a4696dce1e0c15e5f6a8bef4efe8c878437c4c05 Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Tue, 8 Dec 2015 10:05:36 +0800
Subject: [PATCH] Use FakeImage in server test cases.
We have a class FakeImage to fake one or more images. So use it in
test_server.py.
Change-Id: I276e4ade5aecefbe66b9722c1dfbac10b3bd14b6
Implements: blueprint improve-image-unittest-framework
---
.../tests/compute/v2/test_server.py | 40 ++++++++-----------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 359920f230..2241563026 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -107,11 +107,7 @@ class TestServerCreate(TestServer):
self.servers_mock.create.return_value = self.new_server
- self.image = fakes.FakeResource(
- None,
- copy.deepcopy(image_fakes.IMAGE),
- loaded=True,
- )
+ self.image = image_fakes.FakeImage.create_one_image()
self.cimages_mock.get.return_value = self.image
self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
@@ -537,13 +533,9 @@ class TestServerImageCreate(TestServer):
# This is the return value for utils.find_resource()
self.servers_mock.get.return_value = self.server
- self.servers_mock.create_image.return_value = image_fakes.image_id
-
- self.images_mock.get.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(image_fakes.IMAGE),
- loaded=True,
- )
+ self.image = image_fakes.FakeImage.create_one_image()
+ self.images_mock.get.return_value = self.image
+ self.servers_mock.create_image.return_value = self.image.id
# Get the command object to test
self.cmd = server.CreateServerImage(self.app, None)
@@ -569,12 +561,12 @@ class TestServerImageCreate(TestServer):
collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility')
self.assertEqual(collist, columns)
datalist = (
- image_fakes.image_id,
- image_fakes.image_name,
- image_fakes.image_owner,
- image_fakes.image_protected,
- image_fakes.image_tags,
- image_fakes.image_visibility,
+ self.image.id,
+ self.image.name,
+ self.image.owner,
+ self.image.protected,
+ self.image.tags,
+ self.image.visibility,
)
self.assertEqual(datalist, data)
@@ -601,12 +593,12 @@ class TestServerImageCreate(TestServer):
collist = ('id', 'name', 'owner', 'protected', 'tags', 'visibility')
self.assertEqual(collist, columns)
datalist = (
- image_fakes.image_id,
- image_fakes.image_name,
- image_fakes.image_owner,
- image_fakes.image_protected,
- image_fakes.image_tags,
- image_fakes.image_visibility,
+ self.image.id,
+ self.image.name,
+ self.image.owner,
+ self.image.protected,
+ self.image.tags,
+ self.image.visibility,
)
self.assertEqual(datalist, data)