diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-29 15:30:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-29 15:30:53 +0000 |
| commit | 883278f3597800af8431ab3b97633040ac7a903d (patch) | |
| tree | 6913fe1af6cc7c0733b7334a0f6cdac3cb40590a /openstackclient | |
| parent | fda84a277fc86443b3ba429dc291770f9b2a48e9 (diff) | |
| parent | c5a55d1370d92ffc6eb0f142633e4d4883453b1b (diff) | |
| download | python-openstackclient-883278f3597800af8431ab3b97633040ac7a903d.tar.gz | |
Merge "User FakeFlavor in TestServerResize."
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index b3bf5e01..726d75e0 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -666,11 +666,8 @@ class TestServerResize(TestServer): self.servers_mock.revert_resize.return_value = None # This is the return value for utils.find_resource() - self.flavors_get_return_value = fakes.FakeResource( - None, - copy.deepcopy(compute_fakes.FLAVOR), - loaded=True, - ) + self.flavors_get_return_value = \ + compute_fakes.FakeFlavor.create_one_flavor() self.flavors_mock.get.return_value = self.flavors_get_return_value # Get the command object to test @@ -700,11 +697,11 @@ class TestServerResize(TestServer): def test_server_resize(self): arglist = [ - '--flavor', compute_fakes.flavor_id, + '--flavor', self.flavors_get_return_value.id, self.server.id, ] verifylist = [ - ('flavor', compute_fakes.flavor_id), + ('flavor', self.flavors_get_return_value.id), ('confirm', False), ('revert', False), ('server', self.server.id), @@ -718,7 +715,7 @@ class TestServerResize(TestServer): self.server.id, ) self.flavors_mock.get.assert_called_with( - compute_fakes.flavor_id, + self.flavors_get_return_value.id, ) self.servers_mock.resize.assert_called_with( |