Moved RESET to end of color dictionaries and skip a test on Mac since it is unreliable on Azure DevOps CI

Author: tleonhardt

cmd2/ansi.py

@@ -29,7 +29,6 @@
     '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 @@
     '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 @@
     '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 @@
     'bright_magenta': Back.LIGHTMAGENTA_EX,
     'bright_cyan': Back.LIGHTCYAN_EX,
     'bright_white': Back.LIGHTWHITE_EX,
+    'reset': Back.RESET,
 }
 
 FG_RESET = FG_COLORS['reset']

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()