From 2466c0fd7ba7dbb9374be3e20433305dc6c18561 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 29 Dec 2010 17:42:28 +0100
Subject: [PATCH] =?UTF-8?q?cli:=20Change=20=E2=80=9C<=E2=80=A6>=E2=80=9D?=
=?UTF-8?q?=20in=20query=20output=20to=20=E2=80=9C(=E2=80=A6)=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This should reduce the amount of damage in case of accidential copy &
paste.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cli.py | 6 +++---
test/ganeti.cli_unittest.py | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 25e3d7690..38129418a 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -2391,13 +2391,13 @@ class _QueryColumnFormatter:
"Found value %r for abnormal status %s" % (value, status)
if status == constants.QRFS_UNKNOWN:
- return "<unknown>"
+ return "(unknown)"
if status == constants.QRFS_NODATA:
- return "<nodata>"
+ return "(nodata)"
if status == constants.QRFS_UNAVAIL:
- return "<unavail>"
+ return "(unavail)"
raise NotImplementedError("Unknown status %s" % status)
diff --git a/test/ganeti.cli_unittest.py b/test/ganeti.cli_unittest.py
index 0e76e83e2..f1e1e38ce 100755
--- a/test/ganeti.cli_unittest.py
+++ b/test/ganeti.cli_unittest.py
@@ -394,9 +394,9 @@ class TestFormatQueryResult(unittest.TestCase):
separator="|"),
(cli.QR_UNKNOWN, [
"ID|unk|Unavail|NoData",
- "1|<unknown>|N|",
- "2|<unknown>|<nodata>|x",
- "3|<unknown>|N|<unavail>",
+ "1|(unknown)|N|",
+ "2|(unknown)|(nodata)|x",
+ "3|(unknown)|N|(unavail)",
]))
def testNoData(self):
@@ -448,8 +448,8 @@ class TestFormatQueryResult(unittest.TestCase):
separator="|"),
(cli.QR_INCOMPLETE, [
"1|N|",
- "2|<nodata>|x",
- "3|N|<unavail>",
+ "2|(nodata)|x",
+ "3|N|(unavail)",
]))
def testInvalidFieldType(self):
--
GitLab