fix: tests failing on ARM MacOS (#82)

Author: peterHoburg

CONTRIBUTING.rst

@@ -4,7 +4,8 @@ Contribution guide
 Setting up the environment
 --------------------------
 
-1. ``make install``
+1. `Install MariaDB <https://mariadb.com/kb/en/binary-packages/>`_
+2. ``make install``
 
 Code contributions
 ------------------

Makefile

@@ -118,7 +118,7 @@ clean:                                              ## Cleanup temporary build a
 .PHONY: test
 test:                                              ## Run the tests
 	@echo "${INFO} Running test cases... 🧪"
-	@uv run pytest -n 2 --quiet
+	@uv run pytest --quiet --runpytest subprocess
 	@echo "${OK} Tests passed ✨"
 
 .PHONY: coverage

pyproject.toml

@@ -83,6 +83,7 @@ dev = [
   "pytest-xdist",
   "pytest-sugar",
   "slotscheck",
+  "psycopg-binary", # This fixes tests failing on M series CPUs.
   # lint
   "mypy",
   "ruff",
@@ -111,10 +112,8 @@ dev = [
   "myst-parser",
   "sphinx-autodoc-typehints",
   "sphinx-rtd-theme",
-
 ]
 
-
 ##################
 # External Tools #
 ##################

src/pytest_databases/_service.py

@@ -8,12 +8,12 @@
 from contextlib import AbstractContextManager, contextmanager
 from typing import TYPE_CHECKING, Any, Callable
 
+import docker
 import filelock
 import pytest
+from docker.errors import ImageNotFound
 from typing_extensions import Self
 
-import docker
-from docker.errors import ImageNotFound
 from pytest_databases.helpers import get_xdist_worker_id
 from pytest_databases.types import ServiceContainer
 
@@ -137,20 +137,24 @@ def run(
         ulimits: list[Ulimit] | None = None,
         shm_size: int | None = None,
         mem_limit: str | None = None,
+        platform: str | None = None,
     ) -> Generator[ServiceContainer, None, None]:
         if check is None and wait_for_log is None:
             msg = "Must set at least check or wait_for_log"
             raise ValueError(msg)
 
+        platform_kwarg = {}
+        if platform is not None:
+            platform_kwarg = {"platform": platform}
+
         name = f"pytest_databases_{name}"
         lock = filelock.FileLock(self._tmp_path / name) if self._is_xdist else contextlib.nullcontext()
-
         with lock:
             container = self._get_container(name)
             try:
                 self._client.images.get(image)
             except ImageNotFound:
-                self._client.images.pull(*image.rsplit(":", maxsplit=1))  # pyright: ignore[reportCallIssue,reportArgumentType]
+                self._client.images.pull(*image.rsplit(":", maxsplit=1), **platform_kwarg)  # pyright: ignore[reportCallIssue,reportArgumentType]
 
             if container is None:
                 container = self._client.containers.run(  # pyright: ignore[reportCallIssue,reportArgumentType]
@@ -164,6 +168,7 @@ def run(
                     environment=env,
                     ulimits=ulimits,
                     mem_limit=mem_limit,
+                    **platform_kwarg,  # pyright: ignore[reportArgumentType]
                 )
 
                 # reload the container; sometimes it can take a while before docker

src/pytest_databases/docker/bigquery.py

@@ -27,6 +27,11 @@ def bigquery_image() -> str:
     return "ghcr.io/goccy/bigquery-emulator:latest"
 
 
+@pytest.fixture(scope="session")
+def platform() -> str:
+    return "linux/x86_64"
+
+
 @dataclass
 class BigQueryService(ServiceContainer):
     project: str
@@ -47,6 +52,7 @@ def bigquery_service(
     docker_service: DockerService,
     xdist_bigquery_isolation_level: XdistIsolationLevel,
     bigquery_image: str,
+    platform: str,
 ) -> Generator[BigQueryService, None, None]:
     project = "emulator-test-project"
     dataset = "test-dataset"
@@ -83,6 +89,7 @@ def check(_service: ServiceContainer) -> bool:
         container_port=9050,
         timeout=60,
         transient=xdist_bigquery_isolation_level == "server",
+        platform=platform,
     ) as service:
         yield BigQueryService(
             host=service.host,

src/pytest_databases/docker/mysql.py

@@ -30,12 +30,18 @@ def xdist_mysql_isolation_level() -> XdistIsolationLevel:
     return "database"
 
 
+@pytest.fixture(scope="session")
+def platform() -> str:
+    return "linux/x86_64"
+
+
 @contextlib.contextmanager
 def _provide_mysql_service(
     docker_service: DockerService,
     image: str,
     name: str,
     isolation_level: XdistIsolationLevel,
+    platform: str,
 ) -> Generator[MySQLService, None, None]:
     user = "app"
     password = "super-secret"
@@ -95,6 +101,7 @@ def check(_service: ServiceContainer) -> bool:
             'FLUSH PRIVILEGES;"'
         ),
         transient=isolation_level == "server",
+        platform=platform,
     ) as service:
         yield MySQLService(
             db=db_name,
@@ -114,12 +121,14 @@ def mysql_service(mysql_8_service: MySQLService) -> MySQLService:
 def mysql_56_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
+    platform: str,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:5.6",
         name="mysql-56",
         docker_service=docker_service,
         isolation_level=xdist_mysql_isolation_level,
+        platform=platform,
     ) as service:
         yield service
 
@@ -128,12 +137,14 @@ def mysql_56_service(
 def mysql_57_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
+    platform: str,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:5.7",
         name="mysql-57",
         docker_service=docker_service,
         isolation_level=xdist_mysql_isolation_level,
+        platform=platform,
     ) as service:
         yield service
 
@@ -142,12 +153,14 @@ def mysql_57_service(
 def mysql_8_service(
     docker_service: DockerService,
     xdist_mysql_isolation_level: XdistIsolationLevel,
+    platform: str,
 ) -> Generator[MySQLService, None, None]:
     with _provide_mysql_service(
         image="mysql:8",
         name="mysql-8",
         docker_service=docker_service,
         isolation_level=xdist_mysql_isolation_level,
+        platform=platform,
     ) as service:
         yield service
 

tests/conftest.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import platform
+
 import pytest
 
 pytestmark = pytest.mark.anyio
@@ -9,3 +11,6 @@
     "pytest_databases.docker",
     "pytester",
 ]
+
+PLATFORM_PROCESSOR = platform.processor()
+PLATFORM_SYSTEM = platform.system()

tests/test_mssql.py

@@ -2,13 +2,16 @@
 
 import pytest
 
+from tests.conftest import PLATFORM_PROCESSOR
+
 
 @pytest.mark.parametrize(
     "service_fixture",
     [
         "mssql_service",
     ],
 )
+@pytest.mark.skipif(PLATFORM_PROCESSOR == "arm", reason="ARM bug. https://github.com/pymssql/pymssql/issues/822")
 def test_service_fixture(pytester: pytest.Pytester, service_fixture: str) -> None:
     pytester.makepyfile(f"""
     import pymssql
@@ -39,6 +42,7 @@ def test({service_fixture}):
         "mssql_connection",
     ],
 )
+@pytest.mark.skipif(PLATFORM_PROCESSOR == "arm", reason="ARM bug. https://github.com/pymssql/pymssql/issues/822")
 def test_connection_fixture(pytester: pytest.Pytester, connection_fixture: str) -> None:
     pytester.makepyfile(f"""
     import pymssql
@@ -58,6 +62,7 @@ def test({connection_fixture}):
     result.assert_outcomes(passed=1)
 
 
+@pytest.mark.skipif(PLATFORM_PROCESSOR == "arm", reason="ARM bug. https://github.com/pymssql/pymssql/issues/822")
 def test_xdist_isolate_database(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
     import pymssql
@@ -76,6 +81,7 @@ def test_2(mssql_connection):
     result.assert_outcomes(passed=2)
 
 
+@pytest.mark.skipif(PLATFORM_PROCESSOR == "arm", reason="ARM bug. https://github.com/pymssql/pymssql/issues/822")
 def test_xdist_isolate_server(pytester: pytest.Pytester) -> None:
     pytester.makepyfile("""
     import pymssql

tests/test_mysql.py

@@ -36,8 +36,8 @@ def test({service_fixture}):
 @pytest.mark.parametrize(
     "connection_fixture",
     [
-        "mysql_56_connection",
-        "mysql_57_connection",
+    "mysql_56_connection",
+    "mysql_57_connection",
     ],
 )
 def test_connection_fixture(pytester: pytest.Pytester, connection_fixture: str) -> None: