diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-29 19:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-29 19:46:41 +0000 |
| commit | 691ca9800612022d56af40eda15eaabf6fc20fae (patch) | |
| tree | 578212398dbdc2b7c63e96b719c3e4d4a3200450 /openstackclient | |
| parent | 883278f3597800af8431ab3b97633040ac7a903d (diff) | |
| parent | b7f62058ad19ccba6574c5f791d87620e62be6ea (diff) | |
| download | python-openstackclient-691ca9800612022d56af40eda15eaabf6fc20fae.tar.gz | |
Merge "Use FakeFlavor in TestServerCreate."
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 726d75e0..feb60547 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, |