diff options
| -rw-r--r-- | cmd2/ansi.py | 4 | ||||
| -rw-r--r-- | tests/test_utils.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd2/ansi.py b/cmd2/ansi.py index e1a4671d..0e73ab57 100644 --- a/cmd2/ansi.py +++ b/cmd2/ansi.py @@ -29,7 +29,6 @@ FG_COLORS = { 'magenta': Fore.MAGENTA, 'cyan': Fore.CYAN, 'white': Fore.WHITE, - 'reset': Fore.RESET, 'bright_black': Fore.LIGHTBLACK_EX, 'bright_red': Fore.LIGHTRED_EX, 'bright_green': Fore.LIGHTGREEN_EX, @@ -38,6 +37,7 @@ FG_COLORS = { 'bright_magenta': Fore.LIGHTMAGENTA_EX, 'bright_cyan': Fore.LIGHTCYAN_EX, 'bright_white': Fore.LIGHTWHITE_EX, + 'reset': Fore.RESET, } # Background color presets @@ -50,7 +50,6 @@ BG_COLORS = { 'magenta': Back.MAGENTA, 'cyan': Back.CYAN, 'white': Back.WHITE, - 'reset': Back.RESET, 'bright_black': Back.LIGHTBLACK_EX, 'bright_red': Back.LIGHTRED_EX, 'bright_green': Back.LIGHTGREEN_EX, @@ -59,6 +58,7 @@ BG_COLORS = { 'bright_magenta': Back.LIGHTMAGENTA_EX, 'bright_cyan': Back.LIGHTCYAN_EX, 'bright_white': Back.LIGHTWHITE_EX, + 'reset': Back.RESET, } FG_RESET = FG_COLORS['reset'] diff --git a/tests/test_utils.py b/tests/test_utils.py index db43c292..262e6c54 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -245,7 +245,8 @@ def test_proc_reader_terminate(pr_none): else: assert ret_code == -signal.SIGTERM -@pytest.mark.skipif(sys.platform == 'linux', reason="Test doesn't work correctly on TravisCI") +@pytest.mark.skipif(not sys.platform.startswith('win'), + reason="Test doesn't work correctly on TravisCI and is unreliable on Azure DevOps macOS") def test_proc_reader_wait(pr_none): assert pr_none._proc.poll() is None pr_none.wait() |