From b7f62058ad19ccba6574c5f791d87620e62be6ea Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Sat, 28 Nov 2015 16:29:55 +0800
Subject: [PATCH] Use FakeFlavor in TestServerCreate.
Change-Id: Ib82f845258b1ad78cbc8b23d28fa42e7ccc8097a
Implements: blueprint improve-flavor-unit-test
---
.../tests/compute/v2/test_server.py | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 726d75e052..feb6054766 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -110,11 +110,7 @@ class TestServerCreate(TestServer):
)
self.cimages_mock.get.return_value = self.image
- self.flavor = fakes.FakeResource(
- None,
- copy.deepcopy(compute_fakes.FLAVOR),
- loaded=True,
- )
+ self.flavor = compute_fakes.FakeFlavor.create_one_flavor()
self.flavors_mock.get.return_value = self.flavor
self.volume = fakes.FakeResource(
@@ -192,7 +188,7 @@ class TestServerCreate(TestServer):
self.assertEqual(collist, columns)
datalist = (
'',
- 'Large ()',
+ self.flavor.name + ' ()',
self.new_server.id,
self.new_server.name,
self.new_server.networks,
@@ -276,7 +272,7 @@ class TestServerCreate(TestServer):
self.assertEqual(collist, columns)
datalist = (
'',
- 'Large ()',
+ self.flavor.name + ' ()',
self.new_server.id,
self.new_server.name,
self.new_server.networks,
@@ -349,7 +345,7 @@ class TestServerCreate(TestServer):
self.assertEqual(collist, columns)
datalist = (
'',
- 'Large ()',
+ self.flavor.name + ' ()',
self.new_server.id,
self.new_server.name,
self.new_server.networks,
@@ -360,13 +356,13 @@ class TestServerCreate(TestServer):
def test_server_create_with_block_device_mapping(self):
arglist = [
'--image', 'image1',
- '--flavor', compute_fakes.flavor_id,
+ '--flavor', self.flavor.id,
'--block-device-mapping', compute_fakes.block_device_mapping,
self.new_server.name,
]
verifylist = [
('image', 'image1'),
- ('flavor', compute_fakes.flavor_id),
+ ('flavor', self.flavor.id),
('block_device_mapping', [compute_fakes.block_device_mapping]),
('config_drive', False),
('server_name', self.new_server.name),
@@ -418,7 +414,7 @@ class TestServerCreate(TestServer):
self.assertEqual(collist, columns)
datalist = (
'',
- 'Large ()',
+ self.flavor.name + ' ()',
self.new_server.id,
self.new_server.name,
self.new_server.networks,