From b52ae93cd2f18e23185685b4984b466e92635531 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Wed, 14 Dec 2022 10:39:44 +0000
Subject: [PATCH] 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>
---
openstackclient/compute/v2/server.py | 9 +++++----
openstackclient/tests/functional/common/test_help.py | 8 +++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 7afacb3eb0..3fb9bf098c 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -2748,8 +2748,9 @@ class ListServer(command.Lister):
class LockServer(command.Command):
- _description = _("Lock server(s). A non-admin user will not be able to "
- "execute actions")
+ _description = _("""Lock server(s)
+
+A non-admin user will not be able to execute actions.""")
def get_parser(self, prog_name):
parser = super(LockServer, self).get_parser(prog_name)
@@ -4516,7 +4517,7 @@ class SshServer(command.Command):
class StartServer(command.Command):
- _description = _("Start server(s).")
+ _description = _("Start server(s)")
def get_parser(self, prog_name):
parser = super(StartServer, self).get_parser(prog_name)
@@ -4548,7 +4549,7 @@ class StartServer(command.Command):
class StopServer(command.Command):
- _description = _("Stop server(s).")
+ _description = _("Stop server(s)")
def get_parser(self, prog_name):
parser = super(StopServer, self).get_parser(prog_name)
diff --git a/openstackclient/tests/functional/common/test_help.py b/openstackclient/tests/functional/common/test_help.py
index c55741f19c..e84c22e00d 100644
--- a/openstackclient/tests/functional/common/test_help.py
+++ b/openstackclient/tests/functional/common/test_help.py
@@ -30,9 +30,7 @@ class HelpTests(base.TestCase):
('server image create',
'Create a new server disk image from an existing server'),
('server list', 'List servers'),
- ('server lock',
- 'Lock server(s). '
- 'A non-admin user will not be able to execute actions'),
+ ('server lock', 'Lock server(s)'),
('server migrate', 'Migrate server to different host'),
('server pause', 'Pause server(s)'),
('server reboot', 'Perform a hard or soft server reboot'),
@@ -46,8 +44,8 @@ class HelpTests(base.TestCase):
('server shelve', 'Shelve and optionally offload server(s)'),
('server show', 'Show server details'),
('server ssh', 'SSH to server'),
- ('server start', 'Start server(s).'),
- ('server stop', 'Stop server(s).'),
+ ('server start', 'Start server(s)'),
+ ('server stop', 'Stop server(s)'),
('server suspend', 'Suspend server(s)'),
('server unlock', 'Unlock server(s)'),
('server unpause', 'Unpause server(s)'),