Skip to content

Commit b52ae93

Browse files
committed
Fix functional-tips job
A recent change to cliff [1] means we're now stripping periods when generating the summary line of command help strings. Account for this. [1] https://review.opendev.org/c/openstack/cliff/+/867274 Change-Id: I45b39b9fe38914497505f157e91d84cd2f84f547 Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
1 parent 29129a7 commit b52ae93

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

openstackclient/compute/v2/server.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,8 +2748,9 @@ def take_action(self, parsed_args):
27482748

27492749
class LockServer(command.Command):
27502750

2751-
_description = _("Lock server(s). A non-admin user will not be able to "
2752-
"execute actions")
2751+
_description = _("""Lock server(s)
2752+
2753+
A non-admin user will not be able to execute actions.""")
27532754

27542755
def get_parser(self, prog_name):
27552756
parser = super(LockServer, self).get_parser(prog_name)
@@ -4516,7 +4517,7 @@ def take_action(self, parsed_args):
45164517

45174518

45184519
class StartServer(command.Command):
4519-
_description = _("Start server(s).")
4520+
_description = _("Start server(s)")
45204521

45214522
def get_parser(self, prog_name):
45224523
parser = super(StartServer, self).get_parser(prog_name)
@@ -4548,7 +4549,7 @@ def take_action(self, parsed_args):
45484549

45494550

45504551
class StopServer(command.Command):
4551-
_description = _("Stop server(s).")
4552+
_description = _("Stop server(s)")
45524553

45534554
def get_parser(self, prog_name):
45544555
parser = super(StopServer, self).get_parser(prog_name)

openstackclient/tests/functional/common/test_help.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ class HelpTests(base.TestCase):
3030
('server image create',
3131
'Create a new server disk image from an existing server'),
3232
('server list', 'List servers'),
33-
('server lock',
34-
'Lock server(s). '
35-
'A non-admin user will not be able to execute actions'),
33+
('server lock', 'Lock server(s)'),
3634
('server migrate', 'Migrate server to different host'),
3735
('server pause', 'Pause server(s)'),
3836
('server reboot', 'Perform a hard or soft server reboot'),
@@ -46,8 +44,8 @@ class HelpTests(base.TestCase):
4644
('server shelve', 'Shelve and optionally offload server(s)'),
4745
('server show', 'Show server details'),
4846
('server ssh', 'SSH to server'),
49-
('server start', 'Start server(s).'),
50-
('server stop', 'Stop server(s).'),
47+
('server start', 'Start server(s)'),
48+
('server stop', 'Stop server(s)'),
5149
('server suspend', 'Suspend server(s)'),
5250
('server unlock', 'Unlock server(s)'),
5351
('server unpause', 'Unpause server(s)'),

0 commit comments

Comments
 (0)