move to just one Mac test

brainglobe · Feb 4, 2025 · a3a8e4f · a3a8e4f
1 parent ab4d469
commit a3a8e4f
Show file tree

Hide file tree

Showing 23 changed files with 1 addition and 672 deletions.
diff --git a/...tration_output/Darwin_arm/boundaries.tiff → ...egistration_output/Darwin/boundaries.tiff b/...tration_output/Darwin_arm/boundaries.tiff → ...egistration_output/Darwin/boundaries.tiff
diff --git a/...utput/Darwin_arm/deformation_field_0.tiff → ...on_output/Darwin/deformation_field_0.tiff b/...utput/Darwin_arm/deformation_field_0.tiff → ...on_output/Darwin/deformation_field_0.tiff
diff --git a/...utput/Darwin_arm/deformation_field_1.tiff → ...on_output/Darwin/deformation_field_1.tiff b/...utput/Darwin_arm/deformation_field_1.tiff → ...on_output/Darwin/deformation_field_1.tiff
diff --git a/...utput/Darwin_arm/deformation_field_2.tiff → ...on_output/Darwin/deformation_field_2.tiff b/...utput/Darwin_arm/deformation_field_2.tiff → ...on_output/Darwin/deformation_field_2.tiff
diff --git a/...ration_output/Darwin_arm/downsampled.tiff → ...gistration_output/Darwin/downsampled.tiff b/...ration_output/Darwin_arm/downsampled.tiff → ...gistration_output/Darwin/downsampled.tiff
diff --git a/..._output/Darwin_arm/downsampled_brain.tiff → ...tion_output/Darwin/downsampled_brain.tiff b/..._output/Darwin_arm/downsampled_brain.tiff → ...tion_output/Darwin/downsampled_brain.tiff
diff --git a/...tput/Darwin_arm/downsampled_standard.tiff → ...n_output/Darwin/downsampled_standard.tiff b/...tput/Darwin_arm/downsampled_standard.tiff → ...n_output/Darwin/downsampled_standard.tiff
diff --git a/...arwin_arm/downsampled_standard_brain.tiff → ...ut/Darwin/downsampled_standard_brain.tiff b/...arwin_arm/downsampled_standard_brain.tiff → ...ut/Darwin/downsampled_standard_brain.tiff
diff --git a/...n_output/Darwin_arm/registered_atlas.tiff → ...ation_output/Darwin/registered_atlas.tiff b/...n_output/Darwin_arm/registered_atlas.tiff → ...ation_output/Darwin/registered_atlas.tiff
diff --git a/...ut/Darwin_arm/registered_hemispheres.tiff → ...output/Darwin/registered_hemispheres.tiff b/...ut/Darwin_arm/registered_hemispheres.tiff → ...output/Darwin/registered_hemispheres.tiff
diff --git a/...egistration_output/Darwin_arm/volumes.csv → ...ta/registration_output/Darwin/volumes.csv b/...egistration_output/Darwin_arm/volumes.csv → ...ta/registration_output/Darwin/volumes.csv
diff --git a/tests/data/registration_output/Darwin_intel/boundaries.tiff b/tests/data/registration_output/Darwin_intel/boundaries.tiff
diff --git a/tests/data/registration_output/Darwin_intel/deformation_field_0.tiff b/tests/data/registration_output/Darwin_intel/deformation_field_0.tiff
diff --git a/tests/data/registration_output/Darwin_intel/deformation_field_1.tiff b/tests/data/registration_output/Darwin_intel/deformation_field_1.tiff
diff --git a/tests/data/registration_output/Darwin_intel/deformation_field_2.tiff b/tests/data/registration_output/Darwin_intel/deformation_field_2.tiff
diff --git a/tests/data/registration_output/Darwin_intel/downsampled.tiff b/tests/data/registration_output/Darwin_intel/downsampled.tiff
diff --git a/tests/data/registration_output/Darwin_intel/downsampled_brain.tiff b/tests/data/registration_output/Darwin_intel/downsampled_brain.tiff
diff --git a/tests/data/registration_output/Darwin_intel/downsampled_standard.tiff b/tests/data/registration_output/Darwin_intel/downsampled_standard.tiff
diff --git a/tests/data/registration_output/Darwin_intel/downsampled_standard_brain.tiff b/tests/data/registration_output/Darwin_intel/downsampled_standard_brain.tiff
diff --git a/tests/data/registration_output/Darwin_intel/registered_atlas.tiff b/tests/data/registration_output/Darwin_intel/registered_atlas.tiff
diff --git a/tests/data/registration_output/Darwin_intel/registered_hemispheres.tiff b/tests/data/registration_output/Darwin_intel/registered_hemispheres.tiff
diff --git a/tests/data/registration_output/Darwin_intel/volumes.csv b/tests/data/registration_output/Darwin_intel/volumes.csv
diff --git a/tests/tests/test_integration/test_registration.py b/tests/tests/test_integration/test_registration.py
@@ -8,14 +8,7 @@
 
 from .utils import check_images_same, check_volumes_equal
 
-if platform.system() == "Darwin":
-    if platform.machine() == "x86_64":
-        test_dir = "Darwin_intel"
-    else:
-        test_dir = "Darwin_arm"
-else:
-    test_dir = platform.system()
-
+test_dir = platform.system()
 test_data_dir = Path(__file__).parent.parent.parent / "data"
 
 whole_brain_data_dir = test_data_dir / "input" / "brain"