diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-25 02:34:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-25 02:34:10 +0000 |
| commit | 27f1876ea8b7c7b3f4310ed026b3a7c3c7b5b56a (patch) | |
| tree | 0bdfdc973f3a7be52360634d92af3e8c10e41c3f /openstackclient | |
| parent | 1f2fcb570d32480dd814a6419ca4bfe165fdd89e (diff) | |
| parent | 1cf5c5525b2402cfa8ab84103f1849dde6d5ce1a (diff) | |
| download | python-openstackclient-27f1876ea8b7c7b3f4310ed026b3a7c3c7b5b56a.tar.gz | |
Merge "Use class FakeServer in TestServerDelete."
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 6fa7fecc..ae6d5492 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -398,12 +398,11 @@ class TestServerDelete(TestServer): def setUp(self): super(TestServerDelete, self).setUp() + self.server = fakes.FakeServer.create_one_server() + # This is the return value for utils.find_resource() - self.servers_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(compute_fakes.SERVER), - loaded=True, - ) + self.servers_mock.get.return_value = self.server + self.servers_mock.delete.return_value = None # Get the command object to test @@ -411,10 +410,10 @@ class TestServerDelete(TestServer): def test_server_delete_no_options(self): arglist = [ - compute_fakes.server_id, + self.server.id, ] verifylist = [ - ('server', [compute_fakes.server_id]), + ('server', [self.server.id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -422,16 +421,16 @@ class TestServerDelete(TestServer): self.cmd.take_action(parsed_args) self.servers_mock.delete.assert_called_with( - compute_fakes.server_id, + self.server.id, ) @mock.patch.object(common_utils, 'wait_for_delete', return_value=True) def test_server_delete_wait_ok(self, mock_wait_for_delete): arglist = [ - compute_fakes.server_id, '--wait' + self.server.id, '--wait' ] verifylist = [ - ('server', [compute_fakes.server_id]), + ('server', [self.server.id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -439,22 +438,22 @@ class TestServerDelete(TestServer): self.cmd.take_action(parsed_args) self.servers_mock.delete.assert_called_with( - compute_fakes.server_id, + self.server.id, ) mock_wait_for_delete.assert_called_once_with( self.servers_mock, - compute_fakes.server_id, + self.server.id, callback=server._show_progress ) @mock.patch.object(common_utils, 'wait_for_delete', return_value=False) def test_server_delete_wait_fails(self, mock_wait_for_delete): arglist = [ - compute_fakes.server_id, '--wait' + self.server.id, '--wait' ] verifylist = [ - ('server', [compute_fakes.server_id]), + ('server', [self.server.id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -462,12 +461,12 @@ class TestServerDelete(TestServer): self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.servers_mock.delete.assert_called_with( - compute_fakes.server_id, + self.server.id, ) mock_wait_for_delete.assert_called_once_with( self.servers_mock, - compute_fakes.server_id, + self.server.id, callback=server._show_progress ) |