Skip to content

Commit 058232b

Browse files
author
Tang Chen
committed
[Compute] Check return value is None in compute unit tests.
take_action() in commands inheriting from Command returns nothing. So we should assert the return is None in the unit tests of these commands. Change-Id: I953480ecff3b5beb12255d866d0e1df45f130efd Partial-Bug: #1550636
1 parent 2819450 commit 058232b

3 files changed

Lines changed: 33 additions & 45 deletions

File tree

‎openstackclient/tests/compute/v2/test_flavor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ def test_flavor_delete(self):
4949
verifylist = [
5050
('flavor', self.flavor.id),
5151
]
52-
5352
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
5453

55-
self.cmd.take_action(parsed_args)
54+
result = self.cmd.take_action(parsed_args)
5655

5756
self.flavors_mock.delete.assert_called_with(self.flavor.id)
57+
self.assertIsNone(result)
5858

5959
def test_flavor_delete_with_unexist_flavor(self):
6060
self.flavors_mock.get.side_effect = exceptions.NotFound(None)

‎openstackclient/tests/compute/v2/test_server.py‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ def run_method_with_servers(self, method_name, server_count):
7878
]
7979
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
8080

81-
self.cmd.take_action(parsed_args)
81+
result = self.cmd.take_action(parsed_args)
8282

8383
for s in servers:
8484
method = getattr(s, method_name)
8585
method.assert_called_with()
86+
self.assertIsNone(result)
8687

8788

8889
class TestServerCreate(TestServer):
@@ -416,11 +417,10 @@ def test_server_delete_no_options(self):
416417
]
417418
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
418419

419-
self.cmd.take_action(parsed_args)
420+
result = self.cmd.take_action(parsed_args)
420421

421-
self.servers_mock.delete.assert_called_with(
422-
servers[0].id,
423-
)
422+
self.servers_mock.delete.assert_called_with(servers[0].id)
423+
self.assertIsNone(result)
424424

425425
def test_server_delete_multi_servers(self):
426426
servers = self.setup_servers_mock(count=3)
@@ -435,12 +435,13 @@ def test_server_delete_multi_servers(self):
435435
]
436436
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
437437

438-
self.cmd.take_action(parsed_args)
438+
result = self.cmd.take_action(parsed_args)
439439

440440
calls = []
441441
for s in servers:
442442
calls.append(call(s.id))
443443
self.servers_mock.delete.assert_has_calls(calls)
444+
self.assertIsNone(result)
444445

445446
@mock.patch.object(common_utils, 'wait_for_delete', return_value=True)
446447
def test_server_delete_wait_ok(self, mock_wait_for_delete):
@@ -454,17 +455,15 @@ def test_server_delete_wait_ok(self, mock_wait_for_delete):
454455
]
455456
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
456457

457-
self.cmd.take_action(parsed_args)
458-
459-
self.servers_mock.delete.assert_called_with(
460-
servers[0].id,
461-
)
458+
result = self.cmd.take_action(parsed_args)
462459

460+
self.servers_mock.delete.assert_called_with(servers[0].id)
463461
mock_wait_for_delete.assert_called_once_with(
464462
self.servers_mock,
465463
servers[0].id,
466464
callback=server._show_progress
467465
)
466+
self.assertIsNone(result)
468467

469468
@mock.patch.object(common_utils, 'wait_for_delete', return_value=False)
470469
def test_server_delete_wait_fails(self, mock_wait_for_delete):
@@ -480,10 +479,7 @@ def test_server_delete_wait_fails(self, mock_wait_for_delete):
480479

481480
self.assertRaises(SystemExit, self.cmd.take_action, parsed_args)
482481

483-
self.servers_mock.delete.assert_called_with(
484-
servers[0].id,
485-
)
486-
482+
self.servers_mock.delete.assert_called_with(servers[0].id)
487483
mock_wait_for_delete.assert_called_once_with(
488484
self.servers_mock,
489485
servers[0].id,
@@ -910,15 +906,14 @@ def test_server_resize_no_options(self):
910906
]
911907
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
912908

913-
self.cmd.take_action(parsed_args)
909+
result = self.cmd.take_action(parsed_args)
914910

915-
self.servers_mock.get.assert_called_with(
916-
self.server.id,
917-
)
911+
self.servers_mock.get.assert_called_with(self.server.id)
918912

919913
self.assertNotCalled(self.servers_mock.resize)
920914
self.assertNotCalled(self.servers_mock.confirm_resize)
921915
self.assertNotCalled(self.servers_mock.revert_resize)
916+
self.assertIsNone(result)
922917

923918
def test_server_resize(self):
924919
arglist = [
@@ -933,21 +928,19 @@ def test_server_resize(self):
933928
]
934929
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
935930

936-
self.cmd.take_action(parsed_args)
931+
result = self.cmd.take_action(parsed_args)
937932

938-
self.servers_mock.get.assert_called_with(
939-
self.server.id,
940-
)
933+
self.servers_mock.get.assert_called_with(self.server.id)
941934
self.flavors_mock.get.assert_called_with(
942935
self.flavors_get_return_value.id,
943936
)
944-
945937
self.servers_mock.resize.assert_called_with(
946938
self.server,
947939
self.flavors_get_return_value,
948940
)
949941
self.assertNotCalled(self.servers_mock.confirm_resize)
950942
self.assertNotCalled(self.servers_mock.revert_resize)
943+
self.assertIsNone(result)
951944

952945
def test_server_resize_confirm(self):
953946
arglist = [
@@ -961,17 +954,13 @@ def test_server_resize_confirm(self):
961954
]
962955
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
963956

964-
self.cmd.take_action(parsed_args)
965-
966-
self.servers_mock.get.assert_called_with(
967-
self.server.id,
968-
)
957+
result = self.cmd.take_action(parsed_args)
969958

959+
self.servers_mock.get.assert_called_with(self.server.id)
970960
self.assertNotCalled(self.servers_mock.resize)
971-
self.servers_mock.confirm_resize.assert_called_with(
972-
self.server,
973-
)
961+
self.servers_mock.confirm_resize.assert_called_with(self.server)
974962
self.assertNotCalled(self.servers_mock.revert_resize)
963+
self.assertIsNone(result)
975964

976965
def test_server_resize_revert(self):
977966
arglist = [
@@ -985,17 +974,13 @@ def test_server_resize_revert(self):
985974
]
986975
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
987976

988-
self.cmd.take_action(parsed_args)
989-
990-
self.servers_mock.get.assert_called_with(
991-
self.server.id,
992-
)
977+
result = self.cmd.take_action(parsed_args)
993978

979+
self.servers_mock.get.assert_called_with(self.server.id)
994980
self.assertNotCalled(self.servers_mock.resize)
995981
self.assertNotCalled(self.servers_mock.confirm_resize)
996-
self.servers_mock.revert_resize.assert_called_with(
997-
self.server,
998-
)
982+
self.servers_mock.revert_resize.assert_called_with(self.server)
983+
self.assertIsNone(result)
999984

1000985

1001986
class TestServerResume(TestServer):

‎openstackclient/tests/compute/v2/test_service.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ def test_service_delete_no_options(self):
4949
]
5050
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
5151

52-
self.cmd.take_action(parsed_args)
52+
result = self.cmd.take_action(parsed_args)
5353

5454
self.service_mock.delete.assert_called_with(
5555
compute_fakes.service_binary,
5656
)
57+
self.assertIsNone(result)
5758

5859

5960
class TestServiceList(TestService):
@@ -124,12 +125,13 @@ def test_service_set_enable(self):
124125
]
125126
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
126127

127-
self.cmd.take_action(parsed_args)
128+
result = self.cmd.take_action(parsed_args)
128129

129130
self.service_mock.enable.assert_called_with(
130131
compute_fakes.service_host,
131132
compute_fakes.service_binary,
132133
)
134+
self.assertIsNone(result)
133135

134136
def test_service_set_disable(self):
135137
arglist = [
@@ -144,9 +146,10 @@ def test_service_set_disable(self):
144146
]
145147
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
146148

147-
self.cmd.take_action(parsed_args)
149+
result = self.cmd.take_action(parsed_args)
148150

149151
self.service_mock.disable.assert_called_with(
150152
compute_fakes.service_host,
151153
compute_fakes.service_binary,
152154
)
155+
self.assertIsNone(result)

0 commit comments

Comments
 (0)