Reactivate windows color tests

Author: kdeldycke

tests/test_cli.py

@@ -26,7 +26,6 @@
 import pytest
 from boltons.strutils import strip_ansi
 from click_extra.tabulate import output_formats
-from extra_platforms import is_windows
 
 from meta_package_manager import __version__
 from meta_package_manager.pool import pool
@@ -147,14 +146,12 @@ def test_executable_module(self):
             capture_output=True,
             encoding="utf-8",
         )
-
         assert process.returncode == 0
         assert not process.stderr
-
-        expected_output = f"\x1b[97mmpm\x1b[0m, version \x1b[32m{__version__}\x1b[0m\n"
-        if is_windows():
-            expected_output = strip_ansi(expected_output)
-        assert process.stdout == expected_output
+        assert (
+            process.stdout
+            == f"\x1b[97mmpm\x1b[0m, version \x1b[32m{__version__}\x1b[0m\n"
+        )
 
     def test_timeout(self, invoke):
         """Check that the CLI exits with an error when a timeout is reached."""

tests/test_cli_backup.py

@@ -18,8 +18,6 @@
 from __future__ import annotations
 
 import pytest
-from boltons.strutils import strip_ansi
-from extra_platforms import is_windows
 
 from meta_package_manager.base import Operations
 
@@ -69,10 +67,9 @@ def test_single_manager_file_output(self, manager_id, invoke, subcmd):
         assert "mpm-packages.toml" in result.stderr
         if result.exit_code == 2:
             assert not result.stdout
-            expected_error = "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
-            if is_windows():
-                expected_error = strip_ansi(expected_error)
-            assert result.stderr.endswith(expected_error)
+            assert result.stderr.endswith(
+                "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
+            )
         else:
             assert result.exit_code == 0
             self.check_manager_selection(result, {manager_id})

tests/test_cli_install_remove.py

@@ -19,8 +19,6 @@
 import re
 
 import pytest
-from boltons.strutils import strip_ansi
-from extra_platforms import is_windows
 
 from meta_package_manager.pool import pool
 
@@ -114,12 +112,9 @@ def test_single_manager_install_and_remove(self, invoke, manager_id, package_id)
 
             if result.exit_code == 2:
                 assert not result.stdout
-                expected_error = (
+                assert result.stderr.endswith(
                     "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
                 )
-                if is_windows():
-                    expected_error = strip_ansi(expected_error)
-                assert result.stderr.endswith(expected_error)
             else:
                 assert result.exit_code == 0
                 self.check_manager_selection(

tests/test_cli_restore.py

@@ -17,8 +17,6 @@
 from __future__ import annotations
 
 import pytest
-from boltons.strutils import strip_ansi
-from extra_platforms import is_windows
 
 from meta_package_manager.pool import pool
 
@@ -90,10 +88,9 @@ def test_single_manager(self, invoke, create_config, manager_id):
 
         if result.exit_code == 2:
             assert not result.stdout
-            expected_error = "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
-            if is_windows():
-                expected_error = strip_ansi(expected_error)
-            assert result.stderr.endswith(expected_error)
+            assert result.stderr.endswith(
+                "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
+            )
         else:
             assert result.exit_code == 0
             self.check_manager_selection(result, {manager_id})

tests/test_cli_search.py

@@ -24,7 +24,7 @@
 
 import pytest
 from boltons.iterutils import same
-from extra_platforms.pytest import skip_windows, unless_macos
+from extra_platforms.pytest import unless_macos
 
 from meta_package_manager.base import Operations, Package
 from meta_package_manager.pool import pool
@@ -185,11 +185,6 @@ def test_extended_search_multiple_results(self, invoke, query):
         # We should find lots of results for this package search.
         assert int(msg_match.groups()[0]) >= 20
 
-    # XXX Colorama, a dependency of Click, is supposed to transform ANSI codes into
-    # Windows-specific directives but doesn't. Maybe because the running environment is
-    # not considered as a terminal. We need to investigate this further and report
-    # issues to either Click or Colorama.
-    @skip_windows
     def test_search_highlight(self, invoke):
         """We search on cargo as it is available on all platforms.
 

tests/test_cli_upgrade.py

@@ -19,8 +19,6 @@
 import re
 
 import pytest
-from boltons.strutils import strip_ansi
-from extra_platforms import is_windows
 
 from meta_package_manager.base import Operations
 
@@ -79,10 +77,9 @@ def test_single_manager_dry_run_upgrade_all(self, invoke, manager_id, all_option
             assert "assume -A/--all option" in result.stderr
         if result.exit_code == 2:
             assert not result.stdout
-            expected_error = "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
-            if is_windows():
-                expected_error = strip_ansi(expected_error)
-            assert result.stderr.endswith(expected_error)
+            assert result.stderr.endswith(
+                "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
+            )
         else:
             assert result.exit_code == 0
             self.check_manager_selection(result, {manager_id})
@@ -96,10 +93,9 @@ def test_single_manager_upgrade_all(self, invoke, manager_id, all_option):
             assert "assume -A/--all option" in result.stderr
         if result.exit_code == 2:
             assert not result.stdout
-            expected_error = "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
-            if is_windows():
-                expected_error = strip_ansi(expected_error)
-            assert result.stderr.endswith(expected_error)
+            assert result.stderr.endswith(
+                "\x1b[31m\x1b[1mcritical\x1b[0m: No manager selected.\n"
+            )
         else:
             assert result.exit_code == 0
             self.check_manager_selection(result, {manager_id})