From 51cf368e1f43e6c046ddd827b7b5871aaffeb38e Mon Sep 17 00:00:00 2001 From: Pavel Kartavyy Date: Tue, 15 Nov 2016 20:59:55 +0300 Subject: [PATCH] clickhouse-test: use termcolor for text highlighting --- dbms/tests/clickhouse-test | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test index 859dcb088e..927a47e123 100755 --- a/dbms/tests/clickhouse-test +++ b/dbms/tests/clickhouse-test @@ -15,28 +15,14 @@ from subprocess import CalledProcessError from datetime import datetime from time import sleep from errno import ESRCH +from termcolor import colored -if sys.stdout.isatty(): - COLORS = { - "COLOR_RESET": "\033[0m", - "COLOR_WHITE": "\033[1;37m", - "COLOR_FAIL": "\033[1;31m", - "COLOR_UNKNOWN": "\033[1;30m", - "COLOR_OK": "\033[1;32m", - "COLOR_SKIPPED": "\033[1;34m" } -else: - COLORS = { - "COLOR_RESET": "", - "COLOR_WHITE": "", - "COLOR_FAIL": "", - "COLOR_UNKNOWN": "", - "COLOR_OK": "", - "COLOR_SKIPPED": "" } -MSG_FAIL = "{COLOR_WHITE}[ {COLOR_FAIL}FAIL{COLOR_WHITE} ]{COLOR_RESET}".format(**COLORS) -MSG_UNKNOWN = "{COLOR_WHITE}[ {COLOR_UNKNOWN}UNKNOWN{COLOR_WHITE} ]{COLOR_RESET}".format(**COLORS) -MSG_OK = "{COLOR_WHITE}[ {COLOR_OK}OK{COLOR_WHITE} ]{COLOR_RESET}".format(**COLORS) -MSG_SKIPPED = "{COLOR_WHITE}[ {COLOR_SKIPPED}SKIPPED{COLOR_WHITE} ]{COLOR_RESET}".format(**COLORS) +MSG_FAIL = "[ " + colored("FAIL", "red") + " ]" +MSG_UNKNOWN = "[ " + colored("UNKNOWN", "yellow") + " ]" +MSG_OK = "[ " + colored("OK", "green") + " ]" +MSG_SKIPPED = "[ " + colored("SKIPPED", "cyan") + " ]" + def main(args): @@ -107,7 +93,7 @@ def main(args): if not args.zookeeper and 'zookeeper' in name: report_testcase.append(et.Element("skipped", attrib = {"message": "no zookeeper"})) - print(MSG_SKIPPED, " - no zookeeper") + print(MSG_SKIPPED + " - no zookeeper") else: reference_file = os.path.join(suite_dir, name) + '.reference' stdout_file = os.path.join(suite_dir, name) + '.stdout' -- GitLab