mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 04:22:55 +01:00
Merge bitcoin/bitcoin#24793: test: Change color of skipped functional tests
3258bad996262792ba77573d6080dafa3952929c changes color of skipped functional tests (Jacob P. Fickes)
Pull request description:
changes the color of skipped functional tests (currently grey and can be hard to read/invisible on dark backgrounds) to yellow.
resolves #24791
ACKs for top commit:
theStack:
Tested ACK 3258bad996262792ba77573d6080dafa3952929c
jarolrod:
Tested ACK 3258bad996
Tree-SHA512: 3fe5ae0d3b4902b2b6bda6e89ab780feb8bf4b7cb1ce7e8467057b94a1e0a26ddeaf3cac0bc19b06ef10d8bccaac9c495029d42740fbedab8fb0d5fdd7d02eaf
This commit is contained in:
parent
bc6f3046f8
commit
a245e52f55
@ -28,7 +28,7 @@ import logging
|
|||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
# Formatting. Default colors to empty strings.
|
# Formatting. Default colors to empty strings.
|
||||||
BOLD, GREEN, RED, GREY = ("", ""), ("", ""), ("", ""), ("", "")
|
DEFAULT, BOLD, GREEN, RED = ("", ""), ("", ""), ("", ""), ("", "")
|
||||||
try:
|
try:
|
||||||
# Make sure python thinks it can write unicode to its stdout
|
# Make sure python thinks it can write unicode to its stdout
|
||||||
"\u2713".encode("utf_8").decode(sys.stdout.encoding)
|
"\u2713".encode("utf_8").decode(sys.stdout.encoding)
|
||||||
@ -59,10 +59,10 @@ if os.name != 'nt' or sys.getwindowsversion() >= (10, 0, 14393):
|
|||||||
kernel32.SetConsoleMode(stderr, stderr_mode.value | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
|
kernel32.SetConsoleMode(stderr, stderr_mode.value | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
|
||||||
# primitive formatting on supported
|
# primitive formatting on supported
|
||||||
# terminal via ANSI escape sequences:
|
# terminal via ANSI escape sequences:
|
||||||
|
DEFAULT = ('\033[0m', '\033[0m')
|
||||||
BOLD = ('\033[0m', '\033[1m')
|
BOLD = ('\033[0m', '\033[1m')
|
||||||
GREEN = ('\033[0m', '\033[0;32m')
|
GREEN = ('\033[0m', '\033[0;32m')
|
||||||
RED = ('\033[0m', '\033[0;31m')
|
RED = ('\033[0m', '\033[0;31m')
|
||||||
GREY = ('\033[0m', '\033[1;30m')
|
|
||||||
|
|
||||||
TEST_EXIT_PASSED = 0
|
TEST_EXIT_PASSED = 0
|
||||||
TEST_EXIT_SKIPPED = 77
|
TEST_EXIT_SKIPPED = 77
|
||||||
@ -321,11 +321,11 @@ def main():
|
|||||||
|
|
||||||
args, unknown_args = parser.parse_known_args()
|
args, unknown_args = parser.parse_known_args()
|
||||||
if not args.ansi:
|
if not args.ansi:
|
||||||
global BOLD, GREEN, RED, GREY
|
global DEFAULT, BOLD, GREEN, RED
|
||||||
|
DEFAULT = ("", "")
|
||||||
BOLD = ("", "")
|
BOLD = ("", "")
|
||||||
GREEN = ("", "")
|
GREEN = ("", "")
|
||||||
RED = ("", "")
|
RED = ("", "")
|
||||||
GREY = ("", "")
|
|
||||||
|
|
||||||
# args to be passed on always start with two dashes; tests are the remaining unknown args
|
# args to be passed on always start with two dashes; tests are the remaining unknown args
|
||||||
tests = [arg for arg in unknown_args if arg[:2] != "--"]
|
tests = [arg for arg in unknown_args if arg[:2] != "--"]
|
||||||
@ -692,7 +692,7 @@ class TestResult():
|
|||||||
color = RED
|
color = RED
|
||||||
glyph = CROSS
|
glyph = CROSS
|
||||||
elif self.status == "Skipped":
|
elif self.status == "Skipped":
|
||||||
color = GREY
|
color = DEFAULT
|
||||||
glyph = CIRCLE
|
glyph = CIRCLE
|
||||||
|
|
||||||
return color[1] + "%s | %s%s | %s s\n" % (self.name.ljust(self.padding), glyph, self.status.ljust(7), self.time) + color[0]
|
return color[1] + "%s | %s%s | %s s\n" % (self.name.ljust(self.padding), glyph, self.status.ljust(7), self.time) + color[0]
|
||||||
|
Loading…
Reference in New Issue
Block a user