Skip to content

Commit 2dae656

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Identity: Fix DisplayCommandBase comments for cliff Command subclass tests"
2 parents 6a61cb2 + 1225ad5 commit 2dae656

6 files changed

Lines changed: 0 additions & 27 deletions

File tree

‎openstackclient/tests/identity/v2_0/test_endpoint.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ def test_endpoint_delete_no_options(self):
130130
]
131131
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
132132

133-
# DisplayCommandBase.take_action() returns two tuples
134133
self.cmd.take_action(parsed_args)
135134

136135
self.endpoints_mock.delete.assert_called_with(

‎openstackclient/tests/identity/v2_0/test_role.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ def test_role_delete_no_options(self):
232232
]
233233
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
234234

235-
# DisplayCommandBase.take_action() returns two tuples
236235
self.cmd.take_action(parsed_args)
237236

238237
self.roles_mock.delete.assert_called_with(
@@ -446,7 +445,6 @@ def test_role_remove(self):
446445
]
447446
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
448447

449-
# DisplayCommandBase.take_action() returns two tuples
450448
self.cmd.take_action(parsed_args)
451449

452450
# RoleManager.remove_user_role(user, role, tenant=None)

‎openstackclient/tests/identity/v2_0/test_service.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ def test_service_delete_no_options(self):
186186
]
187187
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
188188

189-
# DisplayCommandBase.take_action() returns two tuples
190189
self.cmd.take_action(parsed_args)
191190

192191
self.services_mock.delete.assert_called_with(

‎openstackclient/tests/identity/v2_0/test_user.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ def test_user_delete_no_options(self):
396396
]
397397
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
398398

399-
# DisplayCommandBase.take_action() returns two tuples
400399
self.cmd.take_action(parsed_args)
401400

402401
self.users_mock.delete.assert_called_with(
@@ -554,7 +553,6 @@ def test_user_set_name(self):
554553
]
555554
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
556555

557-
# DisplayCommandBase.take_action() returns two tuples
558556
self.cmd.take_action(parsed_args)
559557

560558
# Set expected values
@@ -585,7 +583,6 @@ def test_user_set_password(self):
585583
]
586584
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
587585

588-
# DisplayCommandBase.take_action() returns two tuples
589586
self.cmd.take_action(parsed_args)
590587

591588
# UserManager.update_password(user, password)
@@ -611,7 +608,6 @@ def test_user_set_password_prompt(self):
611608
]
612609
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
613610

614-
# DisplayCommandBase.take_action() returns two tuples
615611
mocker = mock.Mock()
616612
mocker.return_value = 'abc123'
617613
with mock.patch("openstackclient.common.utils.get_password", mocker):
@@ -639,7 +635,6 @@ def test_user_set_email(self):
639635
]
640636
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
641637

642-
# DisplayCommandBase.take_action() returns two tuples
643638
self.cmd.take_action(parsed_args)
644639

645640
# Set expected values
@@ -669,7 +664,6 @@ def test_user_set_project(self):
669664
]
670665
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
671666

672-
# DisplayCommandBase.take_action() returns two tuples
673667
self.cmd.take_action(parsed_args)
674668

675669
# UserManager.update_tenant(user, tenant)
@@ -694,7 +688,6 @@ def test_user_set_enable(self):
694688
]
695689
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
696690

697-
# DisplayCommandBase.take_action() returns two tuples
698691
self.cmd.take_action(parsed_args)
699692

700693
# Set expected values
@@ -723,7 +716,6 @@ def test_user_set_disable(self):
723716
]
724717
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
725718

726-
# DisplayCommandBase.take_action() returns two tuples
727719
self.cmd.take_action(parsed_args)
728720

729721
# Set expected values

‎openstackclient/tests/identity/v3/test_role.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ def test_role_delete_no_options(self):
304304
]
305305
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
306306

307-
# DisplayCommandBase.take_action() returns two tuples
308307
self.cmd.take_action(parsed_args)
309308

310309
self.roles_mock.delete.assert_called_with(
@@ -625,7 +624,6 @@ def test_role_remove_user_domain(self):
625624
]
626625
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
627626

628-
# DisplayCommandBase.take_action() returns two tuples
629627
self.cmd.take_action(parsed_args)
630628

631629
# Set expected values
@@ -658,7 +656,6 @@ def test_role_remove_user_project(self):
658656
]
659657
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
660658

661-
# DisplayCommandBase.take_action() returns two tuples
662659
self.cmd.take_action(parsed_args)
663660

664661
# Set expected values
@@ -692,7 +689,6 @@ def test_role_remove_group_domain(self):
692689
]
693690
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
694691

695-
# DisplayCommandBase.take_action() returns two tuples
696692
self.cmd.take_action(parsed_args)
697693

698694
# Set expected values
@@ -725,7 +721,6 @@ def test_role_remove_group_project(self):
725721
]
726722
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
727723

728-
# DisplayCommandBase.take_action() returns two tuples
729724
self.cmd.take_action(parsed_args)
730725

731726
# Set expected values
@@ -767,7 +762,6 @@ def test_role_set_no_options(self):
767762
]
768763
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
769764

770-
# DisplayCommandBase.take_action() returns two tuples
771765
self.cmd.take_action(parsed_args)
772766

773767
# Set expected values

‎openstackclient/tests/identity/v3/test_user.py‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@ def test_user_delete_no_options(self):
481481
]
482482
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
483483

484-
# DisplayCommandBase.take_action() returns two tuples
485484
self.cmd.take_action(parsed_args)
486485

487486
self.users_mock.delete.assert_called_with(
@@ -746,7 +745,6 @@ def test_user_set_name(self):
746745
]
747746
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
748747

749-
# DisplayCommandBase.take_action() returns two tuples
750748
self.cmd.take_action(parsed_args)
751749

752750
# Set expected values
@@ -778,7 +776,6 @@ def test_user_set_password(self):
778776
]
779777
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
780778

781-
# DisplayCommandBase.take_action() returns two tuples
782779
self.cmd.take_action(parsed_args)
783780

784781
# Set expected values
@@ -810,7 +807,6 @@ def test_user_set_password_prompt(self):
810807
]
811808
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
812809

813-
# DisplayCommandBase.take_action() returns two tuples
814810
mocker = mock.Mock()
815811
mocker.return_value = 'abc123'
816812
with mock.patch("openstackclient.common.utils.get_password", mocker):
@@ -844,7 +840,6 @@ def test_user_set_email(self):
844840
]
845841
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
846842

847-
# DisplayCommandBase.take_action() returns two tuples
848843
self.cmd.take_action(parsed_args)
849844

850845
# Set expected values
@@ -875,7 +870,6 @@ def test_user_set_project(self):
875870
]
876871
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
877872

878-
# DisplayCommandBase.take_action() returns two tuples
879873
self.cmd.take_action(parsed_args)
880874

881875
# Set expected values
@@ -908,7 +902,6 @@ def test_user_set_project_domain(self):
908902
]
909903
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
910904

911-
# DisplayCommandBase.take_action() returns two tuples
912905
self.cmd.take_action(parsed_args)
913906

914907
# Set expected values
@@ -939,7 +932,6 @@ def test_user_set_enable(self):
939932
]
940933
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
941934

942-
# DisplayCommandBase.take_action() returns two tuples
943935
self.cmd.take_action(parsed_args)
944936

945937
# Set expected values
@@ -969,7 +961,6 @@ def test_user_set_disable(self):
969961
]
970962
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
971963

972-
# DisplayCommandBase.take_action() returns two tuples
973964
self.cmd.take_action(parsed_args)
974965

975966
# Set expected values

0 commit comments

Comments
 (0)