From 46f773762640503530f1987f3b4dd233830ef15e Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 31 Mar 2025 16:32:26 +0200 Subject: [PATCH] xfail -> skipif platform specific tests on other platforms (#49800) --- lib/spack/spack/test/spec_syntax.py | 42 +++++++++++++---------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/lib/spack/spack/test/spec_syntax.py b/lib/spack/spack/test/spec_syntax.py index f9e08915afb..1a80540c042 100644 --- a/lib/spack/spack/test/spec_syntax.py +++ b/lib/spack/spack/test/spec_syntax.py @@ -26,15 +26,9 @@ ) from spack.tokenize import Token -FAIL_ON_WINDOWS = pytest.mark.xfail( - sys.platform == "win32", - raises=(SpecTokenizationError, spack.spec.InvalidHashError), - reason="Unix style path on Windows", -) +SKIP_ON_WINDOWS = pytest.mark.skipif(sys.platform == "win32", reason="Unix style path on Windows") -FAIL_ON_UNIX = pytest.mark.xfail( - sys.platform != "win32", raises=SpecTokenizationError, reason="Windows style path on Unix" -) +SKIP_ON_UNIX = pytest.mark.skipif(sys.platform != "win32", reason="Windows style path on Unix") def simple_package_name(name): @@ -1060,56 +1054,56 @@ def test_error_conditions(text, match_string): [ # Specfile related errors pytest.param( - "/bogus/path/libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS + "/bogus/path/libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_WINDOWS ), - pytest.param("../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS), - pytest.param("./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS), + pytest.param("../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_WINDOWS), + pytest.param("./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_WINDOWS), pytest.param( "libfoo ^/bogus/path/libdwarf.yaml", spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + marks=SKIP_ON_WINDOWS, ), pytest.param( - "libfoo ^../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS + "libfoo ^../../libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_WINDOWS ), pytest.param( - "libfoo ^./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_WINDOWS + "libfoo ^./libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_WINDOWS ), pytest.param( "/bogus/path/libdwarf.yamlfoobar", spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + marks=SKIP_ON_WINDOWS, ), pytest.param( "libdwarf^/bogus/path/libelf.yamlfoobar ^/path/to/bogus.yaml", spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_WINDOWS, + marks=SKIP_ON_WINDOWS, ), pytest.param( - "c:\\bogus\\path\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX + "c:\\bogus\\path\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_UNIX ), - pytest.param("..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX), - pytest.param(".\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX), + pytest.param("..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_UNIX), + pytest.param(".\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_UNIX), pytest.param( "libfoo ^c:\\bogus\\path\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, - marks=FAIL_ON_UNIX, + marks=SKIP_ON_UNIX, ), pytest.param( - "libfoo ^..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX + "libfoo ^..\\..\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_UNIX ), pytest.param( - "libfoo ^.\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=FAIL_ON_UNIX + "libfoo ^.\\libdwarf.yaml", spack.spec.NoSuchSpecFileError, marks=SKIP_ON_UNIX ), pytest.param( "c:\\bogus\\path\\libdwarf.yamlfoobar", spack.spec.SpecFilenameError, - marks=FAIL_ON_UNIX, + marks=SKIP_ON_UNIX, ), pytest.param( "libdwarf^c:\\bogus\\path\\libelf.yamlfoobar ^c:\\path\\to\\bogus.yaml", spack.spec.SpecFilenameError, - marks=FAIL_ON_UNIX, + marks=SKIP_ON_UNIX, ), ], )