Skip to content

Commit

Permalink
Update test skip markers along with relevant imports
Browse files Browse the repository at this point in the history
  • Loading branch information
beeankha committed Jan 18, 2023
1 parent 01680fa commit 7c7cf67
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tests/test_variants.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
import json
import os
from pathlib import Path
import platform
import re
import sys

import pytest
import yaml

from conda.common.compat import on_mac
from conda_build import api, exceptions, variants
from conda_build.utils import package_has_file

Expand Down Expand Up @@ -475,7 +477,7 @@ def test_target_platform_looping(testing_config):
assert len(outputs) == 2


@pytest.mark.skipif(sys.platform == "darwin", reason="Unsatisfiable dependencies for M1 MacOS systems: {'numpy=1.16'}")
@pytest.mark.skipif(on_mac and platform.machine() == "arm64", reason="Unsatisfiable dependencies for M1 MacOS systems: {'numpy=1.16'}")
# TODO Remove the above skip decorator once https://github.com/conda/conda-build/issues/4717 is resolved
def test_numpy_used_variable_looping(testing_config):
outputs = api.get_output_file_paths(os.path.join(variants_dir, "numpy_used"))
Expand Down Expand Up @@ -535,7 +537,7 @@ def test_exclusive_config_file(testing_workdir):
assert variant['abc'] == '123'


@pytest.mark.skipif(sys.platform == "darwin", reason="M1 Mac-specific file system error related to this test")
@pytest.mark.skipif(on_mac and platform.machine() == "arm64", reason="M1 Mac-specific file system error related to this test")
def test_inner_python_loop_with_output(testing_config):
outputs = api.get_output_file_paths(
os.path.join(variants_dir, "test_python_as_subpackage_loop"),
Expand Down

0 comments on commit 7c7cf67

Please sign in to comment.