openstack/python-openstackclient
Code Issues Proposed changes

Merge "[Compute] Check return value is None in compute unit tests."

Browse Source
This commit is contained in:
Jenkins 2016-02-29 18:37:35 +00:00 committed by Gerrit Code Review
commit 60345b7933
3 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/tests/compute/v2/test_flavor.py
View File

@ -49,12 +49,12 @@ class TestFlavorDelete(TestFlavor):
verifylist = [ verifylist = [
('flavor', self.flavor.id), ('flavor', self.flavor.id),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.flavors_mock.delete.assert_called_with(self.flavor.id) self.flavors_mock.delete.assert_called_with(self.flavor.id)
self.assertIsNone(result)
def test_flavor_delete_with_unexist_flavor(self): def test_flavor_delete_with_unexist_flavor(self):
self.flavors_mock.get.side_effect = exceptions.NotFound(None) self.flavors_mock.get.side_effect = exceptions.NotFound(None)

65
openstackclient/tests/compute/v2/test_server.py
View File

@ -78,11 +78,12 @@ class TestServer(compute_fakes.TestComputev2):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
for s in servers: for s in servers:
method = getattr(s, method_name) method = getattr(s, method_name)
method.assert_called_with() method.assert_called_with()
self.assertIsNone(result)
class TestServerCreate(TestServer): class TestServerCreate(TestServer):
@ -416,11 +417,10 @@ class TestServerDelete(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.delete.assert_called_with( self.servers_mock.delete.assert_called_with(servers[0].id)
servers[0].id, self.assertIsNone(result)
)
def test_server_delete_multi_servers(self): def test_server_delete_multi_servers(self):
servers = self.setup_servers_mock(count=3) servers = self.setup_servers_mock(count=3)
@ -435,12 +435,13 @@ class TestServerDelete(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
calls = [] calls = []
for s in servers: for s in servers:
calls.append(call(s.id)) calls.append(call(s.id))
self.servers_mock.delete.assert_has_calls(calls) self.servers_mock.delete.assert_has_calls(calls)
self.assertIsNone(result)
@mock.patch.object(common_utils, 'wait_for_delete', return_value=True) @mock.patch.object(common_utils, 'wait_for_delete', return_value=True)
def test_server_delete_wait_ok(self, mock_wait_for_delete): def test_server_delete_wait_ok(self, mock_wait_for_delete):
@ -454,17 +455,15 @@ class TestServerDelete(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.delete.assert_called_with(
servers[0].id,
)
self.servers_mock.delete.assert_called_with(servers[0].id)
mock_wait_for_delete.assert_called_once_with( mock_wait_for_delete.assert_called_once_with(
self.servers_mock, self.servers_mock,
servers[0].id, servers[0].id,
callback=server._show_progress callback=server._show_progress
) )
self.assertIsNone(result)
@mock.patch.object(common_utils, 'wait_for_delete', return_value=False) @mock.patch.object(common_utils, 'wait_for_delete', return_value=False)
def test_server_delete_wait_fails(self, mock_wait_for_delete): def test_server_delete_wait_fails(self, mock_wait_for_delete):
@ -480,10 +479,7 @@ class TestServerDelete(TestServer):
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
self.servers_mock.delete.assert_called_with( self.servers_mock.delete.assert_called_with(servers[0].id)
servers[0].id,
)
mock_wait_for_delete.assert_called_once_with( mock_wait_for_delete.assert_called_once_with(
self.servers_mock, self.servers_mock,
servers[0].id, servers[0].id,
@ -910,15 +906,14 @@ class TestServerResize(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.get.assert_called_with( self.servers_mock.get.assert_called_with(self.server.id)
self.server.id,
)
self.assertNotCalled(self.servers_mock.resize) self.assertNotCalled(self.servers_mock.resize)
self.assertNotCalled(self.servers_mock.confirm_resize) self.assertNotCalled(self.servers_mock.confirm_resize)
self.assertNotCalled(self.servers_mock.revert_resize) self.assertNotCalled(self.servers_mock.revert_resize)
self.assertIsNone(result)
def test_server_resize(self): def test_server_resize(self):
arglist = [ arglist = [
@ -933,21 +928,19 @@ class TestServerResize(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.get.assert_called_with( self.servers_mock.get.assert_called_with(self.server.id)
self.server.id,
)
self.flavors_mock.get.assert_called_with( self.flavors_mock.get.assert_called_with(
self.flavors_get_return_value.id, self.flavors_get_return_value.id,
) )
self.servers_mock.resize.assert_called_with( self.servers_mock.resize.assert_called_with(
self.server, self.server,
self.flavors_get_return_value, self.flavors_get_return_value,
) )
self.assertNotCalled(self.servers_mock.confirm_resize) self.assertNotCalled(self.servers_mock.confirm_resize)
self.assertNotCalled(self.servers_mock.revert_resize) self.assertNotCalled(self.servers_mock.revert_resize)
self.assertIsNone(result)
def test_server_resize_confirm(self): def test_server_resize_confirm(self):
arglist = [ arglist = [
@ -961,17 +954,13 @@ class TestServerResize(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.get.assert_called_with(
self.server.id,
)
self.servers_mock.get.assert_called_with(self.server.id)
self.assertNotCalled(self.servers_mock.resize) self.assertNotCalled(self.servers_mock.resize)
self.servers_mock.confirm_resize.assert_called_with( self.servers_mock.confirm_resize.assert_called_with(self.server)
self.server,
)
self.assertNotCalled(self.servers_mock.revert_resize) self.assertNotCalled(self.servers_mock.revert_resize)
self.assertIsNone(result)
def test_server_resize_revert(self): def test_server_resize_revert(self):
arglist = [ arglist = [
@ -985,17 +974,13 @@ class TestServerResize(TestServer):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.servers_mock.get.assert_called_with(
self.server.id,
)
self.servers_mock.get.assert_called_with(self.server.id)
self.assertNotCalled(self.servers_mock.resize) self.assertNotCalled(self.servers_mock.resize)
self.assertNotCalled(self.servers_mock.confirm_resize) self.assertNotCalled(self.servers_mock.confirm_resize)
self.servers_mock.revert_resize.assert_called_with( self.servers_mock.revert_resize.assert_called_with(self.server)
self.server, self.assertIsNone(result)
)
class TestServerResume(TestServer): class TestServerResume(TestServer):

9
openstackclient/tests/compute/v2/test_service.py
View File

@ -49,11 +49,12 @@ class TestServiceDelete(TestService):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.service_mock.delete.assert_called_with( self.service_mock.delete.assert_called_with(
compute_fakes.service_binary, compute_fakes.service_binary,
) )
self.assertIsNone(result)
class TestServiceList(TestService): class TestServiceList(TestService):
@ -124,12 +125,13 @@ class TestServiceSet(TestService):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.service_mock.enable.assert_called_with( self.service_mock.enable.assert_called_with(
compute_fakes.service_host, compute_fakes.service_host,
compute_fakes.service_binary, compute_fakes.service_binary,
) )
self.assertIsNone(result)
def test_service_set_disable(self): def test_service_set_disable(self):
arglist = [ arglist = [
@ -144,9 +146,10 @@ class TestServiceSet(TestService):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
self.service_mock.disable.assert_called_with( self.service_mock.disable.assert_called_with(
compute_fakes.service_host, compute_fakes.service_host,
compute_fakes.service_binary, compute_fakes.service_binary,
) )
self.assertIsNone(result)