From 8d42da518664ae60ebf602be8849fa37d661f95d Mon Sep 17 00:00:00 2001 From: Tang Chen Date: Sat, 28 Nov 2015 15:17:50 +0800 Subject: [PATCH] Use FakeFlavor in TestFlavorList. Change-Id: I3595877bed41bc476934ca924f1f9c8c0ad79176 Implements: blueprint improve-flavor-unit-test --- .../tests/compute/v2/test_flavor.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/openstackclient/tests/compute/v2/test_flavor.py b/openstackclient/tests/compute/v2/test_flavor.py index 196723ea..bafa06c3 100644 --- a/openstackclient/tests/compute/v2/test_flavor.py +++ b/openstackclient/tests/compute/v2/test_flavor.py @@ -31,6 +31,9 @@ class TestFlavor(compute_fakes.TestComputev2): class TestFlavorList(TestFlavor): + # Return value of self.flavors_mock.list(). + flavors = compute_fakes.FakeFlavor.create_flavors(count=1) + columns = ( 'ID', 'Name', @@ -47,12 +50,12 @@ class TestFlavorList(TestFlavor): ) data = (( - compute_fakes.flavor_id, - compute_fakes.flavor_name, - compute_fakes.flavor_ram, + flavors[0].id, + flavors[0].name, + flavors[0].ram, '', '', - compute_fakes.flavor_vcpus, + flavors[0].vcpus, '' ), ) data_long = (data[0] + ( @@ -64,13 +67,7 @@ class TestFlavorList(TestFlavor): def setUp(self): super(TestFlavorList, self).setUp() - self.flavors_mock.list.return_value = [ - compute_fakes.FakeFlavorResource( - None, - copy.deepcopy(compute_fakes.FLAVOR), - loaded=True, - ), - ] + self.flavors_mock.list.return_value = self.flavors # Get the command object to test self.cmd = flavor.ListFlavor(self.app, None)