Skip to content

Commit fd53a49

Browse files
author
Tang Chen
committed
[Image] Check return value is None in image 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: I237ea772f74fa52af2e9aacd35d4b9cfb225c94c Partial-Bug: #1550636
1 parent f9add05 commit fd53a49

2 files changed

Lines changed: 46 additions & 34 deletions

File tree

‎openstackclient/tests/image/v1/test_image.py‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,10 @@ def test_image_delete_no_options(self):
236236
]
237237
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
238238

239-
self.cmd.take_action(parsed_args)
239+
result = self.cmd.take_action(parsed_args)
240240

241-
self.images_mock.delete.assert_called_with(
242-
image_fakes.image_id,
243-
)
241+
self.images_mock.delete.assert_called_with(image_fakes.image_id)
242+
self.assertIsNone(result)
244243

245244

246245
class TestImageList(TestImage):
@@ -473,10 +472,11 @@ def test_image_set_no_options(self):
473472
]
474473
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
475474

476-
self.cmd.take_action(parsed_args)
475+
result = self.cmd.take_action(parsed_args)
477476

478477
# Verify update() was not called, if it was show the args
479478
self.assertEqual(self.images_mock.update.call_args_list, [])
479+
self.assertIsNone(result)
480480

481481
def test_image_set_options(self):
482482
arglist = [
@@ -501,7 +501,7 @@ def test_image_set_options(self):
501501
]
502502
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
503503

504-
self.cmd.take_action(parsed_args)
504+
result = self.cmd.take_action(parsed_args)
505505

506506
kwargs = {
507507
'name': 'new-name',
@@ -517,6 +517,7 @@ def test_image_set_options(self):
517517
image_fakes.image_id,
518518
**kwargs
519519
)
520+
self.assertIsNone(result)
520521

521522
def test_image_set_bools1(self):
522523
arglist = [
@@ -533,7 +534,7 @@ def test_image_set_bools1(self):
533534
]
534535
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
535536

536-
self.cmd.take_action(parsed_args)
537+
result = self.cmd.take_action(parsed_args)
537538

538539
kwargs = {
539540
'protected': True,
@@ -544,6 +545,7 @@ def test_image_set_bools1(self):
544545
image_fakes.image_id,
545546
**kwargs
546547
)
548+
self.assertIsNone(result)
547549

548550
def test_image_set_bools2(self):
549551
arglist = [
@@ -560,7 +562,7 @@ def test_image_set_bools2(self):
560562
]
561563
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
562564

563-
self.cmd.take_action(parsed_args)
565+
result = self.cmd.take_action(parsed_args)
564566

565567
kwargs = {
566568
'protected': False,
@@ -571,6 +573,7 @@ def test_image_set_bools2(self):
571573
image_fakes.image_id,
572574
**kwargs
573575
)
576+
self.assertIsNone(result)
574577

575578
def test_image_set_properties(self):
576579
arglist = [
@@ -584,7 +587,7 @@ def test_image_set_properties(self):
584587
]
585588
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
586589

587-
self.cmd.take_action(parsed_args)
590+
result = self.cmd.take_action(parsed_args)
588591

589592
kwargs = {
590593
'properties': {
@@ -598,6 +601,7 @@ def test_image_set_properties(self):
598601
image_fakes.image_id,
599602
**kwargs
600603
)
604+
self.assertIsNone(result)
601605

602606
def test_image_update_volume(self):
603607
# Set up VolumeManager Mock
@@ -639,7 +643,7 @@ def test_image_update_volume(self):
639643
]
640644
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
641645

642-
self.cmd.take_action(parsed_args)
646+
result = self.cmd.take_action(parsed_args)
643647

644648
# VolumeManager.upload_to_image(volume, force, image_name,
645649
# container_format, disk_format)
@@ -650,13 +654,13 @@ def test_image_update_volume(self):
650654
'',
651655
'',
652656
)
653-
654657
# ImageManager.update(image_id, remove_props=, **)
655658
self.images_mock.update.assert_called_with(
656659
image_fakes.image_id,
657660
name='updated_image',
658661
volume='volly',
659662
)
663+
self.assertIsNone(result)
660664

661665

662666
class TestImageShow(TestImage):

‎openstackclient/tests/image/v2/test_image.py‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -445,11 +445,10 @@ def test_image_delete_no_options(self):
445445
]
446446
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
447447

448-
self.cmd.take_action(parsed_args)
448+
result = self.cmd.take_action(parsed_args)
449449

450-
self.images_mock.delete.assert_called_with(
451-
images[0].id,
452-
)
450+
self.images_mock.delete.assert_called_with(images[0].id)
451+
self.assertIsNone(result)
453452

454453
def test_image_delete_multi_images(self):
455454
images = self.setup_images_mock(count=3)
@@ -458,14 +457,13 @@ def test_image_delete_multi_images(self):
458457
verifylist = [
459458
('images', arglist),
460459
]
461-
462460
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
463461

464-
self.cmd.take_action(parsed_args)
462+
result = self.cmd.take_action(parsed_args)
465463

466464
calls = [mock.call(i.id) for i in images]
467-
468465
self.images_mock.delete.assert_has_calls(calls)
466+
self.assertIsNone(result)
469467

470468

471469
class TestImageList(TestImage):
@@ -753,11 +751,13 @@ def test_remove_project_image_no_options(self):
753751
]
754752
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
755753

756-
self.cmd.take_action(parsed_args)
754+
result = self.cmd.take_action(parsed_args)
755+
757756
self.image_members_mock.delete.assert_called_with(
758757
image_fakes.image_id,
759758
identity_fakes.project_id,
760759
)
760+
self.assertIsNone(result)
761761

762762
def test_remove_project_image_with_options(self):
763763
arglist = [
@@ -772,11 +772,13 @@ def test_remove_project_image_with_options(self):
772772
]
773773
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
774774

775-
self.cmd.take_action(parsed_args)
775+
result = self.cmd.take_action(parsed_args)
776+
776777
self.image_members_mock.delete.assert_called_with(
777778
image_fakes.image_id,
778779
identity_fakes.project_id,
779780
)
781+
self.assertIsNone(result)
780782

781783

782784
class TestImageSet(TestImage):
@@ -829,7 +831,7 @@ def test_image_set_options(self):
829831
]
830832
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
831833

832-
self.cmd.take_action(parsed_args)
834+
result = self.cmd.take_action(parsed_args)
833835

834836
kwargs = {
835837
'name': 'new-name',
@@ -842,6 +844,7 @@ def test_image_set_options(self):
842844
# ImageManager.update(image, **kwargs)
843845
self.images_mock.update.assert_called_with(
844846
image_fakes.image_id, **kwargs)
847+
self.assertIsNone(result)
845848

846849
def test_image_set_with_unexist_owner(self):
847850
self.project_mock.get.side_effect = exceptions.NotFound(None)
@@ -855,7 +858,6 @@ def test_image_set_with_unexist_owner(self):
855858
('owner', 'unexist_owner'),
856859
('image', image_fakes.image_id),
857860
]
858-
859861
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
860862

861863
self.assertRaises(
@@ -874,7 +876,6 @@ def test_image_set_with_unexist_project(self):
874876
('project', 'unexist_owner'),
875877
('image', image_fakes.image_id),
876878
]
877-
878879
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
879880

880881
self.assertRaises(
@@ -896,7 +897,7 @@ def test_image_set_bools1(self):
896897
]
897898
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
898899

899-
self.cmd.take_action(parsed_args)
900+
result = self.cmd.take_action(parsed_args)
900901

901902
kwargs = {
902903
'protected': True,
@@ -907,6 +908,7 @@ def test_image_set_bools1(self):
907908
image_fakes.image_id,
908909
**kwargs
909910
)
911+
self.assertIsNone(result)
910912

911913
def test_image_set_bools2(self):
912914
arglist = [
@@ -923,7 +925,7 @@ def test_image_set_bools2(self):
923925
]
924926
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
925927

926-
self.cmd.take_action(parsed_args)
928+
result = self.cmd.take_action(parsed_args)
927929

928930
kwargs = {
929931
'protected': False,
@@ -934,6 +936,7 @@ def test_image_set_bools2(self):
934936
image_fakes.image_id,
935937
**kwargs
936938
)
939+
self.assertIsNone(result)
937940

938941
def test_image_set_properties(self):
939942
arglist = [
@@ -947,7 +950,7 @@ def test_image_set_properties(self):
947950
]
948951
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
949952

950-
self.cmd.take_action(parsed_args)
953+
result = self.cmd.take_action(parsed_args)
951954

952955
kwargs = {
953956
'Alpha': '1',
@@ -958,6 +961,7 @@ def test_image_set_properties(self):
958961
image_fakes.image_id,
959962
**kwargs
960963
)
964+
self.assertIsNone(result)
961965

962966
def test_image_set_fake_properties(self):
963967
arglist = [
@@ -980,7 +984,7 @@ def test_image_set_fake_properties(self):
980984
]
981985
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
982986

983-
self.cmd.take_action(parsed_args)
987+
result = self.cmd.take_action(parsed_args)
984988

985989
kwargs = {
986990
'architecture': 'z80',
@@ -995,6 +999,7 @@ def test_image_set_fake_properties(self):
995999
image_fakes.image_id,
9961000
**kwargs
9971001
)
1002+
self.assertIsNone(result)
9981003

9991004
def test_image_set_tag(self):
10001005
arglist = [
@@ -1007,7 +1012,7 @@ def test_image_set_tag(self):
10071012
]
10081013
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
10091014

1010-
self.cmd.take_action(parsed_args)
1015+
result = self.cmd.take_action(parsed_args)
10111016

10121017
kwargs = {
10131018
'tags': ['test-tag'],
@@ -1017,6 +1022,7 @@ def test_image_set_tag(self):
10171022
image_fakes.image_id,
10181023
**kwargs
10191024
)
1025+
self.assertIsNone(result)
10201026

10211027
def test_image_set_activate(self):
10221028
arglist = [
@@ -1030,7 +1036,7 @@ def test_image_set_activate(self):
10301036
]
10311037
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
10321038

1033-
self.cmd.take_action(parsed_args)
1039+
result = self.cmd.take_action(parsed_args)
10341040

10351041
kwargs = {
10361042
'tags': ['test-tag'],
@@ -1039,12 +1045,12 @@ def test_image_set_activate(self):
10391045
self.images_mock.reactivate.assert_called_with(
10401046
image_fakes.image_id,
10411047
)
1042-
10431048
# ImageManager.update(image, **kwargs)
10441049
self.images_mock.update.assert_called_with(
10451050
image_fakes.image_id,
10461051
**kwargs
10471052
)
1053+
self.assertIsNone(result)
10481054

10491055
def test_image_set_deactivate(self):
10501056
arglist = [
@@ -1058,7 +1064,7 @@ def test_image_set_deactivate(self):
10581064
]
10591065
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
10601066

1061-
self.cmd.take_action(parsed_args)
1067+
result = self.cmd.take_action(parsed_args)
10621068

10631069
kwargs = {
10641070
'tags': ['test-tag'],
@@ -1067,12 +1073,12 @@ def test_image_set_deactivate(self):
10671073
self.images_mock.deactivate.assert_called_with(
10681074
image_fakes.image_id,
10691075
)
1070-
10711076
# ImageManager.update(image, **kwargs)
10721077
self.images_mock.update.assert_called_with(
10731078
image_fakes.image_id,
10741079
**kwargs
10751080
)
1081+
self.assertIsNone(result)
10761082

10771083
def test_image_set_tag_merge(self):
10781084
old_image = copy.copy(image_fakes.IMAGE)
@@ -1088,7 +1094,7 @@ def test_image_set_tag_merge(self):
10881094
]
10891095
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
10901096

1091-
self.cmd.take_action(parsed_args)
1097+
result = self.cmd.take_action(parsed_args)
10921098

10931099
kwargs = {
10941100
'tags': ['old1', 'new2', 'test-tag'],
@@ -1098,6 +1104,7 @@ def test_image_set_tag_merge(self):
10981104
self.assertEqual(image_fakes.image_id, a[0])
10991105
self.assertTrue('tags' in k)
11001106
self.assertEqual(set(kwargs['tags']), set(k['tags']))
1107+
self.assertIsNone(result)
11011108

11021109
def test_image_set_tag_merge_dupe(self):
11031110
old_image = copy.copy(image_fakes.IMAGE)
@@ -1113,7 +1120,7 @@ def test_image_set_tag_merge_dupe(self):
11131120
]
11141121
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
11151122

1116-
self.cmd.take_action(parsed_args)
1123+
result = self.cmd.take_action(parsed_args)
11171124

11181125
kwargs = {
11191126
'tags': ['new2', 'old1'],
@@ -1123,6 +1130,7 @@ def test_image_set_tag_merge_dupe(self):
11231130
self.assertEqual(image_fakes.image_id, a[0])
11241131
self.assertTrue('tags' in k)
11251132
self.assertEqual(set(kwargs['tags']), set(k['tags']))
1133+
self.assertIsNone(result)
11261134

11271135
def test_image_set_dead_options(self):
11281136

0 commit comments

Comments
 (0)