diff --git a/unit_test/main_options_test.py b/unit_test/main_options_test.py index 44d92da8..6e16edef 100644 --- a/unit_test/main_options_test.py +++ b/unit_test/main_options_test.py @@ -1,6 +1,7 @@ import pytest import sys +from fnmatch import fnmatch from cibuildwheel.__main__ import main from cibuildwheel.environment import ParsedEnvironment @@ -60,15 +61,15 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch): @pytest.mark.parametrize('architecture, image, full_image', [ - ('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64'), - ('x86_64', 'manylinux1', 'quay.io/pypa/manylinux1_x86_64'), - ('x86_64', 'manylinux2010', 'quay.io/pypa/manylinux2010_x86_64'), - ('x86_64', 'manylinux2014', 'quay.io/pypa/manylinux2014_x86_64'), + ('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64:*'), + ('x86_64', 'manylinux1', 'quay.io/pypa/manylinux1_x86_64:*'), + ('x86_64', 'manylinux2010', 'quay.io/pypa/manylinux2010_x86_64:*'), + ('x86_64', 'manylinux2014', 'quay.io/pypa/manylinux2014_x86_64:*'), ('x86_64', 'custom_image', 'custom_image'), - ('i686', None, 'quay.io/pypa/manylinux2010_i686'), - ('i686', 'manylinux1', 'quay.io/pypa/manylinux1_i686'), - ('i686', 'manylinux2010', 'quay.io/pypa/manylinux2010_i686'), - ('i686', 'manylinux2014', 'quay.io/pypa/manylinux2014_i686'), + ('i686', None, 'quay.io/pypa/manylinux2010_i686:*'), + ('i686', 'manylinux1', 'quay.io/pypa/manylinux1_i686:*'), + ('i686', 'manylinux2010', 'quay.io/pypa/manylinux2010_i686:*'), + ('i686', 'manylinux2014', 'quay.io/pypa/manylinux2014_i686:*'), ('i686', 'custom_image', 'custom_image'), ]) def test_manylinux_images(architecture, image, full_image, platform, intercepted_build_args, monkeypatch): @@ -78,7 +79,10 @@ def test_manylinux_images(architecture, image, full_image, platform, intercepted main() if platform == 'linux': - assert intercepted_build_args.kwargs['manylinux_images'][architecture] == full_image + assert fnmatch( + intercepted_build_args.kwargs['manylinux_images'][architecture], + full_image + ) else: assert 'manylinux_images' not in intercepted_build_args.kwargs