zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "only_windows" marker for unit tests (#45979)

Browse Source
This commit is contained in:
John W. Parent 2024-10-14 03:02:49 -04:00 committed by GitHub
parent 796e372bde
commit 6c6b262140
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/spack/spack/test/conftest.py
View File

@ -2015,6 +2015,11 @@ def pytest_runtest_setup(item):
if not_on_windows_marker and sys.platform == "win32": if not_on_windows_marker and sys.platform == "win32":
pytest.skip(*not_on_windows_marker.args) pytest.skip(*not_on_windows_marker.args)
# Skip items marked "only windows" if they're run anywhere but Windows
only_windows_marker = item.get_closest_marker(name="only_windows")
if only_windows_marker and sys.platform != "win32":
pytest.skip(*only_windows_marker.args)
def _sequential_executor(*args, **kwargs): def _sequential_executor(*args, **kwargs):
return spack.util.parallel.SequentialExecutor() return spack.util.parallel.SequentialExecutor()

2
lib/spack/spack/test/llnl/util/filesystem.py
View File

@ -1000,7 +1000,7 @@ def setup_test_dirs():
shutil.rmtree(tmpdir.join("f")) shutil.rmtree(tmpdir.join("f"))
@pytest.mark.skipif(sys.platform != "win32", reason="No-op on non Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_sfn(tmpdir): def test_windows_sfn(tmpdir):
# first check some standard Windows locations # first check some standard Windows locations
# we know require sfn names # we know require sfn names

21
lib/spack/spack/test/llnl/util/symlink.py
View File

@ -5,7 +5,6 @@
"""Tests for ``llnl/util/symlink.py``""" """Tests for ``llnl/util/symlink.py``"""
import os import os
import sys
import tempfile import tempfile
import pytest import pytest
@ -37,7 +36,7 @@ def test_symlink_dir(tmpdir):
assert symlink.islink(link_dir) assert symlink.islink(link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_symlink_source_not_exists(tmpdir): def test_symlink_source_not_exists(tmpdir):
"""Test the symlink.symlink method for the case where a source path does not exist""" """Test the symlink.symlink method for the case where a source path does not exist"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -71,7 +70,7 @@ def test_symlink_src_relative_to_link(tmpdir):
assert os.path.lexists(link_dir) assert os.path.lexists(link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_symlink_src_not_relative_to_link(tmpdir): def test_symlink_src_not_relative_to_link(tmpdir):
"""Test the symlink.symlink functionality where the source value does not exist relative to """Test the symlink.symlink functionality where the source value does not exist relative to
the link and not relative to the cwd. NOTE that this symlink api call is EXPECTED to raise the link and not relative to the cwd. NOTE that this symlink api call is EXPECTED to raise
@ -98,7 +97,7 @@ def test_symlink_src_not_relative_to_link(tmpdir):
assert not os.path.lexists(link_dir) assert not os.path.lexists(link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_symlink_link_already_exists(tmpdir): def test_symlink_link_already_exists(tmpdir):
"""Test the symlink.symlink method for the case where a link already exists""" """Test the symlink.symlink method for the case where a link already exists"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -113,7 +112,7 @@ def test_symlink_link_already_exists(tmpdir):
@pytest.mark.skipif(not symlink._windows_can_symlink(), reason="Test requires elevated privileges") @pytest.mark.skipif(not symlink._windows_can_symlink(), reason="Test requires elevated privileges")
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_symlink_win_file(tmpdir): def test_symlink_win_file(tmpdir):
"""Check that symlink.symlink makes a symlink file when run with elevated permissions""" """Check that symlink.symlink makes a symlink file when run with elevated permissions"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -130,7 +129,7 @@ def test_symlink_win_file(tmpdir):
@pytest.mark.skipif(not symlink._windows_can_symlink(), reason="Test requires elevated privileges") @pytest.mark.skipif(not symlink._windows_can_symlink(), reason="Test requires elevated privileges")
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_symlink_win_dir(tmpdir): def test_symlink_win_dir(tmpdir):
"""Check that symlink.symlink makes a symlink dir when run with elevated permissions""" """Check that symlink.symlink makes a symlink dir when run with elevated permissions"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -147,7 +146,7 @@ def test_symlink_win_dir(tmpdir):
assert not symlink._windows_is_junction(link_dir) assert not symlink._windows_is_junction(link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_create_junction(tmpdir): def test_windows_create_junction(tmpdir):
"""Test the symlink._windows_create_junction method""" """Test the symlink._windows_create_junction method"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -163,7 +162,7 @@ def test_windows_create_junction(tmpdir):
assert not os.path.islink(junction_link_dir) assert not os.path.islink(junction_link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_create_hard_link(tmpdir): def test_windows_create_hard_link(tmpdir):
"""Test the symlink._windows_create_hard_link method""" """Test the symlink._windows_create_hard_link method"""
with tmpdir.as_cwd(): with tmpdir.as_cwd():
@ -179,7 +178,7 @@ def test_windows_create_hard_link(tmpdir):
assert not os.path.islink(link_file) assert not os.path.islink(link_file)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_create_link_dir(tmpdir): def test_windows_create_link_dir(tmpdir):
"""Test the functionality of the windows_create_link method with a directory """Test the functionality of the windows_create_link method with a directory
which should result in making a junction. which should result in making a junction.
@ -198,7 +197,7 @@ def test_windows_create_link_dir(tmpdir):
assert not os.path.islink(link_dir) assert not os.path.islink(link_dir)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_create_link_file(tmpdir): def test_windows_create_link_file(tmpdir):
"""Test the functionality of the windows_create_link method with a file """Test the functionality of the windows_create_link method with a file
which should result in the creation of a hard link. It also tests the which should result in the creation of a hard link. It also tests the
@ -215,7 +214,7 @@ def test_windows_create_link_file(tmpdir):
assert not symlink._windows_is_junction(link_file) assert not symlink._windows_is_junction(link_file)
@pytest.mark.skipif(sys.platform != "win32", reason="Test is only for Windows") @pytest.mark.only_windows("Test is for Windows specific behavior")
def test_windows_read_link(tmpdir): def test_windows_read_link(tmpdir):
"""Makes sure symlink.readlink can read the link source for hard links and """Makes sure symlink.readlink can read the link source for hard links and
junctions on windows.""" junctions on windows."""

1
pytest.ini
View File

@ -15,3 +15,4 @@ markers =
enable_compiler_execution: enable compiler execution to detect link paths and libc enable_compiler_execution: enable compiler execution to detect link paths and libc
disable_clean_stage_check: avoid failing tests if there are leftover files in the stage area disable_clean_stage_check: avoid failing tests if there are leftover files in the stage area
not_on_windows: mark tests that are skipped on Windows not_on_windows: mark tests that are skipped on Windows
only_windows: mark tests that are skipped everywhere but Windows