Skip to content

Commit 762c4c9

Browse files
author
Tang Chen
committed
[Identity] Check return value is None in identity v3 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: I02af06b3d476aac2d93a23ef2111cdc7fa0892ec Partial-Bug: #1550636
1 parent 752705a commit 762c4c9

9 files changed

Lines changed: 64 additions & 30 deletions

File tree

openstackclient/tests/identity/v3/test_credential.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ def test_credential_set_valid(self):
9696
'--data', self.json_data,
9797
identity_fakes.credential_id,
9898
]
99-
10099
parsed_args = self.check_parser(self.cmd, arglist, [])
101-
self.cmd.take_action(parsed_args)
100+
101+
result = self.cmd.take_action(parsed_args)
102+
103+
self.assertIsNone(result)
102104

103105
def test_credential_set_valid_with_project(self):
104106
arglist = [
@@ -108,6 +110,8 @@ def test_credential_set_valid_with_project(self):
108110
'--project', identity_fakes.project_name,
109111
identity_fakes.credential_id,
110112
]
111-
112113
parsed_args = self.check_parser(self.cmd, arglist, [])
113-
self.cmd.take_action(parsed_args)
114+
115+
result = self.cmd.take_action(parsed_args)
116+
117+
self.assertIsNone(result)

openstackclient/tests/identity/v3/test_identity_provider.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,13 @@ def test_delete_identity_provider(self):
258258
('identity_provider', identity_fakes.idp_id),
259259
]
260260
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
261-
self.cmd.take_action(parsed_args)
261+
262+
result = self.cmd.take_action(parsed_args)
263+
262264
self.identity_providers_mock.delete.assert_called_with(
263265
identity_fakes.idp_id,
264266
)
267+
self.assertIsNone(result)
265268

266269

267270
class TestIdentityProviderList(TestIdentityProvider):

openstackclient/tests/identity/v3/test_mappings.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ def test_delete_mapping(self):
9292
verifylist = [
9393
('mapping', identity_fakes.mapping_id)
9494
]
95-
9695
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
97-
self.cmd.take_action(parsed_args)
96+
97+
result = self.cmd.take_action(parsed_args)
98+
9899
self.mapping_mock.delete.assert_called_with(
99100
identity_fakes.mapping_id)
101+
self.assertIsNone(result)
100102

101103

102104
class TestMappingList(TestMapping):
@@ -234,7 +236,6 @@ def test_set_rules_wrong_file_path(self):
234236
('mapping', identity_fakes.mapping_id),
235237
('rules', identity_fakes.mapping_rules_file_path)
236238
]
237-
238239
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
239240

240241
self.assertRaises(

openstackclient/tests/identity/v3/test_protocol.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,12 @@ def test_delete_identity_provider(self):
9292
('identity_provider', identity_fakes.idp_id),
9393
]
9494
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
95-
self.cmd.take_action(parsed_args)
95+
96+
result = self.cmd.take_action(parsed_args)
97+
9698
self.protocols_mock.delete.assert_called_with(
9799
identity_fakes.idp_id, identity_fakes.protocol_id)
100+
self.assertIsNone(result)
98101

99102

100103
class TestProtocolList(TestProtocol):

openstackclient/tests/identity/v3/test_role.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,12 @@ def test_role_delete_no_options(self):
306306
]
307307
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
308308

309-
self.cmd.take_action(parsed_args)
309+
result = self.cmd.take_action(parsed_args)
310310

311311
self.roles_mock.delete.assert_called_with(
312312
identity_fakes.role_id,
313313
)
314+
self.assertIsNone(result)
314315

315316

316317
class TestRoleList(TestRole):
@@ -640,7 +641,7 @@ def test_role_remove_user_domain(self):
640641
]
641642
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
642643

643-
self.cmd.take_action(parsed_args)
644+
result = self.cmd.take_action(parsed_args)
644645

645646
# Set expected values
646647
kwargs = {
@@ -653,6 +654,7 @@ def test_role_remove_user_domain(self):
653654
identity_fakes.role_id,
654655
**kwargs
655656
)
657+
self.assertIsNone(result)
656658

657659
def test_role_remove_user_project(self):
658660
arglist = [
@@ -672,7 +674,7 @@ def test_role_remove_user_project(self):
672674
]
673675
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
674676

675-
self.cmd.take_action(parsed_args)
677+
result = self.cmd.take_action(parsed_args)
676678

677679
# Set expected values
678680
kwargs = {
@@ -685,6 +687,7 @@ def test_role_remove_user_project(self):
685687
identity_fakes.role_id,
686688
**kwargs
687689
)
690+
self.assertIsNone(result)
688691

689692
def test_role_remove_group_domain(self):
690693
arglist = [
@@ -705,7 +708,7 @@ def test_role_remove_group_domain(self):
705708
]
706709
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
707710

708-
self.cmd.take_action(parsed_args)
711+
result = self.cmd.take_action(parsed_args)
709712

710713
# Set expected values
711714
kwargs = {
@@ -718,6 +721,7 @@ def test_role_remove_group_domain(self):
718721
identity_fakes.role_id,
719722
**kwargs
720723
)
724+
self.assertIsNone(result)
721725

722726
def test_role_remove_group_project(self):
723727
arglist = [
@@ -737,7 +741,7 @@ def test_role_remove_group_project(self):
737741
]
738742
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
739743

740-
self.cmd.take_action(parsed_args)
744+
result = self.cmd.take_action(parsed_args)
741745

742746
# Set expected values
743747
kwargs = {
@@ -750,6 +754,7 @@ def test_role_remove_group_project(self):
750754
identity_fakes.role_id,
751755
**kwargs
752756
)
757+
self.assertIsNone(result)
753758

754759

755760
class TestRoleSet(TestRole):
@@ -778,7 +783,7 @@ def test_role_set_no_options(self):
778783
]
779784
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
780785

781-
self.cmd.take_action(parsed_args)
786+
result = self.cmd.take_action(parsed_args)
782787

783788
# Set expected values
784789
kwargs = {
@@ -789,6 +794,7 @@ def test_role_set_no_options(self):
789794
identity_fakes.role_id,
790795
**kwargs
791796
)
797+
self.assertIsNone(result)
792798

793799

794800
class TestRoleShow(TestRole):

openstackclient/tests/identity/v3/test_service_provider.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,13 @@ def test_delete_service_provider(self):
188188
('service_provider', service_fakes.sp_id),
189189
]
190190
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
191-
self.cmd.take_action(parsed_args)
191+
192+
result = self.cmd.take_action(parsed_args)
193+
192194
self.service_providers_mock.delete.assert_called_with(
193195
service_fakes.sp_id,
194196
)
197+
self.assertIsNone(result)
195198

196199

197200
class TestServiceProviderList(TestServiceProvider):

openstackclient/tests/identity/v3/test_token.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ def test_token_revoke(self):
123123
verifylist = [('token', self.TOKEN)]
124124
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
125125

126-
self.cmd.take_action(parsed_args)
126+
result = self.cmd.take_action(parsed_args)
127127

128128
self.tokens_mock.revoke_token.assert_called_with(self.TOKEN)
129+
self.assertIsNone(result)

openstackclient/tests/identity/v3/test_trust.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,12 @@ def test_trust_delete(self):
141141
]
142142
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
143143

144-
self.cmd.take_action(parsed_args)
144+
result = self.cmd.take_action(parsed_args)
145145

146146
self.trusts_mock.delete.assert_called_with(
147147
identity_fakes.trust_id,
148148
)
149+
self.assertIsNone(result)
149150

150151

151152
class TestTrustList(TestTrust):

0 commit comments

Comments
 (0)