TST: reorder and uniform skip markers

Group similar tests together and use similar constructs to skip tests
on platforms not supporting the tested features.  This made it
evident that we are skipping a valid test on macOS.  Fix that.

Author: dnicolodi

tests/test_wheel.py

@@ -85,22 +85,6 @@ def test_scipy_like(wheel_scipy_like):
     assert name.group('plat') == PLATFORM
 
 
-@pytest.mark.skipif(platform.system() != 'Linux', reason='Needs library vendoring, only implemented in POSIX')
-def test_contents(package_library, wheel_library):
-    artifact = wheel.wheelfile.WheelFile(wheel_library)
-
-    for name, regex in zip(sorted(wheel_contents(artifact)), [
-        re.escape('.library.mesonpy.libs/libexample.so'),
-        re.escape('library-1.0.0.data/headers/examplelib.h'),
-        re.escape('library-1.0.0.data/scripts/example'),
-        re.escape('library-1.0.0.dist-info/METADATA'),
-        re.escape('library-1.0.0.dist-info/RECORD'),
-        re.escape('library-1.0.0.dist-info/WHEEL'),
-        re.escape('library.libs/libexample.so'),
-    ]):
-        assert re.match(regex, name), f'{name!r} does not match {regex!r}'
-
-
 def test_purelib_and_platlib(wheel_purelib_and_platlib):
     artifact = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib)
 
@@ -144,47 +128,35 @@ def test_configure_data(wheel_configure_data):
     }
 
 
-@pytest.mark.skipif(platform.system() not in ['Linux', 'Darwin'], reason='Unsupported on this platform for now')
-def test_local_lib(venv, wheel_link_against_local_lib):
-    venv.pip('install', wheel_link_against_local_lib)
-    output = venv.python('-c', 'import example; print(example.example_sum(1, 2))')
-    assert int(output) == 3
-
-
 def test_contents_license_file(wheel_license_file):
     artifact = wheel.wheelfile.WheelFile(wheel_license_file)
     assert artifact.read('license_file-1.0.0.dist-info/LICENSE.custom').rstrip() == b'Hello!'
 
 
-@pytest.mark.skipif(sys.platform in {'win32', 'cygwin'}, reason='Platform does not support executable bit')
-def test_executable_bit(wheel_executable_bit):
-    artifact = wheel.wheelfile.WheelFile(wheel_executable_bit)
-
-    executable_files = {
-        'executable_bit-1.0.0.data/purelib/executable_module.py',
-        'executable_bit-1.0.0.data/scripts/example',
-        'executable_bit-1.0.0.data/scripts/example-script',
-    }
-    for info in artifact.infolist():
-        mode = (info.external_attr >> 16) & 0o777
-        assert bool(mode & stat.S_IXUSR) == (info.filename in executable_files)
-
+@pytest.mark.skipif(platform.system() not in {'Linux', 'Darwin'}, reason='Not supported on this platform')
+def test_contents(package_library, wheel_library):
+    artifact = wheel.wheelfile.WheelFile(wheel_library)
 
-def test_detect_wheel_tag_module(wheel_purelib_and_platlib):
-    name = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib).parsed_filename
-    assert name.group('pyver') == INTERPRETER
-    assert name.group('abi') == ABI
-    assert name.group('plat') == PLATFORM
+    for name, regex in zip(sorted(wheel_contents(artifact)), [
+        re.escape('.library.mesonpy.libs/libexample.so'),
+        re.escape('library-1.0.0.data/headers/examplelib.h'),
+        re.escape('library-1.0.0.data/scripts/example'),
+        re.escape('library-1.0.0.dist-info/METADATA'),
+        re.escape('library-1.0.0.dist-info/RECORD'),
+        re.escape('library-1.0.0.dist-info/WHEEL'),
+        re.escape('library.libs/libexample.so'),
+    ]):
+        assert re.match(regex, name), f'{name!r} does not match {regex!r}'
 
 
-def test_detect_wheel_tag_script(wheel_executable):
-    name = wheel.wheelfile.WheelFile(wheel_executable).parsed_filename
-    assert name.group('pyver') == 'py3'
-    assert name.group('abi') == 'none'
-    assert name.group('plat') == PLATFORM
+@pytest.mark.skipif(platform.system() not in {'Linux', 'Darwin'}, reason='Not supported on this platform')
+def test_local_lib(venv, wheel_link_against_local_lib):
+    venv.pip('install', wheel_link_against_local_lib)
+    output = venv.python('-c', 'import example; print(example.example_sum(1, 2))')
+    assert int(output) == 3
 
 
-@pytest.mark.skipif(platform.system() not in ['Linux', 'Darwin'], reason='Unsupported on this platform for now')
+@pytest.mark.skipif(platform.system() not in {'Linux', 'Darwin'}, reason='Not supported on this platform')
 def test_rpath(wheel_link_against_local_lib, tmp_path):
     artifact = wheel.wheelfile.WheelFile(wheel_link_against_local_lib)
     artifact.extractall(tmp_path)
@@ -197,7 +169,7 @@ def test_rpath(wheel_link_against_local_lib, tmp_path):
         assert '@loader_path/.link_against_local_lib.mesonpy.libs' in dylib.rpath
 
 
-@pytest.mark.skipif(platform.system() not in ['Linux', 'Darwin'], reason='Unsupported on this platform for now')
+@pytest.mark.skipif(platform.system() not in {'Linux', 'Darwin'}, reason='Not supported on this platform')
 def test_uneeded_rpath(wheel_purelib_and_platlib, tmp_path):
     artifact = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib)
     artifact.extractall(tmp_path)
@@ -213,6 +185,34 @@ def test_uneeded_rpath(wheel_purelib_and_platlib, tmp_path):
             assert 'mesonpy.libs' not in rpath
 
 
+@pytest.mark.skipif(platform.system() not in {'Linux', 'Darwin'}, reason='Not supported on this platform')
+def test_executable_bit(wheel_executable_bit):
+    artifact = wheel.wheelfile.WheelFile(wheel_executable_bit)
+
+    executable_files = {
+        'executable_bit-1.0.0.data/purelib/executable_module.py',
+        'executable_bit-1.0.0.data/scripts/example',
+        'executable_bit-1.0.0.data/scripts/example-script',
+    }
+    for info in artifact.infolist():
+        mode = (info.external_attr >> 16) & 0o777
+        assert bool(mode & stat.S_IXUSR) == (info.filename in executable_files)
+
+
+def test_detect_wheel_tag_module(wheel_purelib_and_platlib):
+    name = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib).parsed_filename
+    assert name.group('pyver') == INTERPRETER
+    assert name.group('abi') == ABI
+    assert name.group('plat') == PLATFORM
+
+
+def test_detect_wheel_tag_script(wheel_executable):
+    name = wheel.wheelfile.WheelFile(wheel_executable).parsed_filename
+    assert name.group('pyver') == 'py3'
+    assert name.group('abi') == 'none'
+    assert name.group('plat') == PLATFORM
+
+
 def test_entrypoints(wheel_full_metadata):
     artifact = wheel.wheelfile.WheelFile(wheel_full_metadata)