From c3e3c392a6154e826cbf5a9fc2b8f2f9c8daadb4 Mon Sep 17 00:00:00 2001
From: markus-ferrell <116021216+markus-ferrell@users.noreply.github.com>
Date: Fri, 20 Jan 2023 20:54:06 -0500
Subject: Windows/testing: enable tests for "spack find" (#33588)

---
 lib/spack/spack/test/cmd/find.py | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/spack/test/cmd/find.py b/lib/spack/spack/test/cmd/find.py
index 2406eeb62e..17153f998f 100644
--- a/lib/spack/spack/test/cmd/find.py
+++ b/lib/spack/spack/test/cmd/find.py
@@ -25,8 +25,6 @@ install = SpackCommand("install")
 
 base32_alphabet = "abcdefghijklmnopqrstuvwxyz234567"
 
-pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
-
 
 @pytest.fixture(scope="module")
 def parser():
@@ -131,15 +129,28 @@ def test_namespaces_shown_correctly(database):
 
 @pytest.mark.db
 def test_find_cli_output_format(database, mock_tty_stdout):
+    # Currently logging on Windows detaches stdout
+    # from the terminal so we miss some output during tests
+    # TODO: (johnwparent): Once logging is amended on Windows,
+    # restore this test
     out = find("zmpi")
-    assert out.endswith(
-        dedent(
-            """\
-    zmpi@1.0
-    ==> 1 installed package
-    """
+    if not sys.platform == "win32":
+        assert out.endswith(
+            dedent(
+                """\
+      zmpi@1.0
+      ==> 1 installed package
+      """
+            )
+        )
+    else:
+        assert out.endswith(
+            dedent(
+                """\
+      zmpi@1.0
+      """
+            )
         )
-    )
 
 
 def _check_json_output(spec_list):
@@ -349,6 +360,7 @@ def test_find_command_basic_usage(database):
     assert "mpileaks" in output
 
 
+@pytest.mark.skipif(sys.platform == "win32", reason="envirnment is not yet supported on windows")
 @pytest.mark.regression("9875")
 def test_find_prefix_in_env(
     mutable_mock_env_path, install_mockery, mock_fetch, mock_packages, mock_archive, config
-- 
cgit v1.2.3-60-g2f50