sphuber
commented
1 month ago You can use this for the config_sqlite_dos fixture:
(aiida-py311) sph@invader:~/code/aiida/env/dev/aiida-core$ git stash show stash@{0} -p
diff --git a/src/aiida/tools/pytest_fixtures/__init__.py b/src/aiida/tools/pytest_fixtures/__init__.py
index 6181183d1..79d027f02 100644
--- a/src/aiida/tools/pytest_fixtures/__init__.py
+++ b/src/aiida/tools/pytest_fixtures/__init__.py
@@ -25,7 +25,7 @@ from .orm import (
aiida_localhost,
ssh_key,
)
-from .storage import config_psql_dos, postgres_cluster
+from .storage import config_psql_dos, config_sqlite_dos, postgres_cluster
__all__ = (
'aiida_code_installed',
diff --git a/src/aiida/tools/pytest_fixtures/storage.py b/src/aiida/tools/pytest_fixtures/storage.py
index d76c9b445..e216df664 100644
--- a/src/aiida/tools/pytest_fixtures/storage.py
+++ b/src/aiida/tools/pytest_fixtures/storage.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import pathlib
import typing as t
import pytest
@@ -85,3 +86,24 @@ def config_psql_dos(
return storage_config
return factory
+
+
+
+@pytest.fixture(scope='session')
+def config_sqlite_dos(
+ tmp_path_factory: pytest.TempPathFactory,
+) -> t.Callable[[str | None, str | None, str | None], dict[str, t.Any]]:
+ """Return a profile configuration for the :class:`~aiida.storage.sqlite_dos.backend.SqliteDosStorage`.
+
+ The factory has the following signature to allow further configuring the database that is created:
+
+ :param database_name: Name of the database to be created.
+ :returns: The dictionary with the storage configuration for the ``core.sqlite_dos`` storage plugin.
+ """
+
+ def factory(filepath: str | pathlib.Path | None = None) -> dict[str, t.Any]:
+ return {
+ 'filepath': str(filepath or tmp_path_factory.mktemp('test_sqlite_dos_storage'))
+ }
+
+ return factory
diff --git a/tests/conftest.py b/tests/conftest.py
index 55bf01a18..4c7f7f7d0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -35,7 +35,7 @@ pytest_plugins = ['aiida.tools.pytest_fixtures', 'sphinx.testing.fixtures']
@pytest.fixture(scope='session')
-def aiida_profile(aiida_config, aiida_profile_factory, config_psql_dos):
+def aiida_profile(aiida_config, aiida_profile_factory, config_psql_dos, config_sqlite_dos):
"""Create and load a profile with ``core.psql_dos`` as a storage backend and RabbitMQ as the broker.
This overrides the ``aiida_profile`` fixture provided by ``aiida-core`` which runs with ``core.sqlite_dos`` and
@@ -43,7 +43,7 @@ def aiida_profile(aiida_config, aiida_profile_factory, config_psql_dos):
be run against the main storage backend, which is ``core.sqlite_dos``.
"""
with aiida_profile_factory(
- aiida_config, storage_backend='core.psql_dos', storage_config=config_psql_dos(), broker_backend='core.rabbitmq'
+ aiida_config, storage_backend='core.sqlite_dos', storage_config=config_sqlite_dos(), broker_backend='core.rabbitmq'
) as profile:
yield profile
agoscinski
danielhollas
codecov[bot]
The purpose of this PR is twofold:
sqlite_dosas a storage backendTwo new pytest markers are added to the test suite:
requires_pgsqlfor tests that are known to require PostgreSQL (i.e. do not work with SQLite)prestowhich is an alias fornot requires_rmq and not requires_pgsql. The tests are marked withprestoautomagically intests/conftest.py:pytest_collection_modifyitemsTwo new CI jobs are added:
test-prestoruns withpytest -m prestotest-sqliteruns withpytest -mnot requires_pgsql`. Perhaps we might retain only one of them?In exchange for introducing two new ones, I removed the two verdi jobs and moved the corresponding tests (such as
verdi devel check-importsafter the normal test run. These are super fast and setting them up separately takes much more time then running them. Happy to discuss this though.