Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: prevent deadlock when linux32 fails (#2880)

Browse Source 
This was the case when running `nox -s tests -- --run-podman -v -s 'unit_test/oci_container_test.py::test_multiarch_image[podman-OCIPlatform.i386]'` on macOS arm64.
This commit is contained in:
Matthieu Darbois
2026-05-31 23:23:14 -04:00
committed by GitHub
parent ca0dd067e0
commit 3c07d63629
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/oci_container.py
+4 -1
View File
@@ -298,7 +298,10 @@ class OCIContainer:
).strip() ).strip()
else: else:
raise raise
simulate_32_bit = container_machine not in {"i686", "armv7l", "armv8l"} if container_machine not in {"i686", "armv7l", "armv8l"}:
simulate_32_bit = True
# sanity check to ensure no deadlock waiting for container to start
call(*run_cmd, self.image, "linux32", "/bin/true", capture_stdout=True)
shell_args = ["linux32", "/bin/bash"] if simulate_32_bit else ["/bin/bash"] shell_args = ["linux32", "/bin/bash"] if simulate_32_bit else ["/bin/bash"]
unit_test/oci_container_test.py
+13 -6
View File
@@ -555,9 +555,12 @@ def test_local_image(
platform, platform,
}: }:
pytest.skip("Skipping test because docker on this platform does not support QEMU") pytest.skip("Skipping test because docker on this platform does not support QEMU")
if container_engine.name == "podman" and platform == OCIPlatform.ARMV7: if container_engine.name == "podman":
# both GHA & local macOS arm64 podman desktop are failing if platform == OCIPlatform.ARMV7:
pytest.xfail("podman fails with armv7l images") # both GHA & local macOS arm64 podman desktop are failing
pytest.xfail("podman fails with armv7l images")
elif platform == OCIPlatform.i386 and sys.platform.startswith("darwin"):
pytest.xfail("podman fails with i386 images on macOS")
remote_image = "debian:trixie-slim" remote_image = "debian:trixie-slim"
platform_name = platform.value.replace("/", "_") platform_name = platform.value.replace("/", "_")
@@ -636,9 +639,13 @@ def test_multiarch_image(container_engine: OCIContainerEngineConfig, platform: O
platform, platform,
}: }:
pytest.skip("Skipping test because docker on this platform does not support QEMU") pytest.skip("Skipping test because docker on this platform does not support QEMU")
if container_engine.name == "podman" and platform == OCIPlatform.ARMV7: if container_engine.name == "podman":
# both GHA & local macOS arm64 podman desktop are failing if platform == OCIPlatform.ARMV7:
pytest.xfail("podman fails with armv7l images") # both GHA & local macOS arm64 podman desktop are failing
pytest.xfail("podman fails with armv7l images")
elif platform == OCIPlatform.i386 and sys.platform.startswith("darwin"):
pytest.xfail("podman fails with i386 images on macOS")
with OCIContainer( with OCIContainer(
engine=container_engine, image="debian:trixie-slim", oci_platform=platform engine=container_engine, image="debian:trixie-slim", oci_platform=platform
) as container: ) as container: