From c90c7666b929f96e4c02916ebd54a311f21f1c98 Mon Sep 17 00:00:00 2001 From: Henry Fredrick Schreiner Date: Mon, 18 Jan 2021 09:54:32 -0500 Subject: [PATCH] tests: fix arch for platform tests --- unit_test/main_tests/conftest.py | 6 ++++++ unit_test/main_tests/main_options_test.py | 12 ------------ unit_test/main_tests/main_platform_test.py | 2 -- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/unit_test/main_tests/conftest.py b/unit_test/main_tests/conftest.py index c9ae6e8a..c70ff98e 100644 --- a/unit_test/main_tests/conftest.py +++ b/unit_test/main_tests/conftest.py @@ -1,3 +1,4 @@ +import platform as platform_module import subprocess import sys from pathlib import Path @@ -60,6 +61,11 @@ def platform(request, monkeypatch): platform_value = request.param monkeypatch.setenv('CIBW_PLATFORM', platform_value) + if platform_value == 'windows': + monkeypatch.setattr(platform_module, 'machine', lambda: 'AMD64') + else: + monkeypatch.setattr(platform_module, 'machine', lambda: 'x86_64') + marker = request.node.get_closest_marker('allow_empty') if marker is not None and (len(marker.args) == 0 or platform_value in marker.args): def pass_exit(val: int): diff --git a/unit_test/main_tests/main_options_test.py b/unit_test/main_tests/main_options_test.py index fef74203..345cfe2a 100644 --- a/unit_test/main_tests/main_options_test.py +++ b/unit_test/main_tests/main_options_test.py @@ -11,7 +11,6 @@ from cibuildwheel.util import BuildSelector # CIBW_PLATFORM is tested in main_platform_test.py -@pytest.mark.allow_empty('windows') def test_output_dir(platform, intercepted_build_args, monkeypatch): OUTPUT_DIR = Path('some_output_dir') @@ -22,14 +21,12 @@ def test_output_dir(platform, intercepted_build_args, monkeypatch): assert intercepted_build_args.args[0].output_dir == OUTPUT_DIR -@pytest.mark.allow_empty('windows') def test_output_dir_default(platform, intercepted_build_args, monkeypatch): main() assert intercepted_build_args.args[0].output_dir == Path('wheelhouse') -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('also_set_environment', [False, True]) def test_output_dir_argument(also_set_environment, platform, intercepted_build_args, monkeypatch): OUTPUT_DIR = Path('some_output_dir') @@ -70,7 +67,6 @@ def test_empty_selector(platform, intercepted_build_args, monkeypatch): assert e.value.code == 3 -@pytest.mark.allow_empty @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:*'), @@ -114,7 +110,6 @@ def get_default_repair_command(platform): raise ValueError('Unknown platform', platform) -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('repair_command', [None, 'repair', 'repair -w {dest_dir} {wheel}']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_repair_command(repair_command, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -131,7 +126,6 @@ def test_repair_command(repair_command, platform_specific, platform, intercepted assert intercepted_build_args.args[0].repair_command == expected_repair -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('environment', [ {}, {'something': 'value'}, @@ -153,7 +147,6 @@ def test_environment(environment, platform_specific, platform, intercepted_build assert intercepted_environment.as_dictionary(prev_environment={}) == environment -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('test_requires', [None, 'requirement other_requirement']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_test_requires(test_requires, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -169,7 +162,6 @@ def test_test_requires(test_requires, platform_specific, platform, intercepted_b assert intercepted_build_args.args[0].test_requires == (test_requires or '').split() -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('test_extras', [None, 'extras']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_test_extras(test_extras, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -185,7 +177,6 @@ def test_test_extras(test_extras, platform_specific, platform, intercepted_build assert intercepted_build_args.args[0].test_extras == ('[' + test_extras + ']' if test_extras else '') -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('test_command', [None, 'test --command']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_test_command(test_command, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -201,7 +192,6 @@ def test_test_command(test_command, platform_specific, platform, intercepted_bui assert intercepted_build_args.args[0].test_command == test_command -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('before_build', [None, 'before --build']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_before_build(before_build, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -217,7 +207,6 @@ def test_before_build(before_build, platform_specific, platform, intercepted_bui assert intercepted_build_args.args[0].before_build == before_build -@pytest.mark.allow_empty('windows') @pytest.mark.parametrize('build_verbosity', [None, 0, 2, -2, 4, -4]) @pytest.mark.parametrize('platform_specific', [False, True]) def test_build_verbosity(build_verbosity, platform_specific, platform, intercepted_build_args, monkeypatch): @@ -256,7 +245,6 @@ def test_build_selector_migrations(intercepted_build_args, monkeypatch, option_n assert intercepted_build_selector.skip_patterns == build_selector_patterns -@pytest.mark.allow_empty @pytest.mark.parametrize('before_all', ["", None, 'test text']) @pytest.mark.parametrize('platform_specific', [False, True]) def test_before_all(before_all, platform_specific, platform, intercepted_build_args, monkeypatch): diff --git a/unit_test/main_tests/main_platform_test.py b/unit_test/main_tests/main_platform_test.py index 6445f331..0f277afe 100644 --- a/unit_test/main_tests/main_platform_test.py +++ b/unit_test/main_tests/main_platform_test.py @@ -52,7 +52,6 @@ def test_unknown_platform(monkeypatch, capsys): assert 'cibuildwheel: Unsupported platform: nonexistent' in err -@pytest.mark.allow_empty('windows') def test_platform_argument(platform, intercepted_build_args, monkeypatch): monkeypatch.setenv('CIBW_PLATFORM', 'nonexistent') monkeypatch.setattr(sys, 'argv', sys.argv + ['--platform', platform]) @@ -62,7 +61,6 @@ def test_platform_argument(platform, intercepted_build_args, monkeypatch): assert intercepted_build_args.args[0].package_dir == MOCK_PACKAGE_DIR -@pytest.mark.allow_empty('windows') def test_platform_environment(platform, intercepted_build_args, monkeypatch): main()