diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 2972ca0..bcb255d 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -109,6 +109,15 @@ jobs: -f docker/elasticsearch/Dockerfile.amd64 docker/elasticsearch echo 'ELASTICSEARCH_IMAGE=elasticsearch-kuromoji:e2e' >> "$GITHUB_ENV" + - name: Build MinIO images from source + if: matrix.storage.minio_enabled == 'true' + working-directory: e2e-test/resources + run: | + docker build -t minio-source:local -f docker/minio/Dockerfile.minio docker/minio + docker build -t minio-mc-source:local -f docker/minio/Dockerfile.mc docker/minio + echo 'MINIO_IMAGE=minio-source:local' >> "$GITHUB_ENV" + echo 'MINIO_MC_IMAGE=minio-mc-source:local' >> "$GITHUB_ENV" + - name: Generate MinIO credentials if: matrix.storage.minio_enabled == 'true' run: | diff --git a/e2e-test/resources b/e2e-test/resources index 4076071..c2a7b4f 160000 --- a/e2e-test/resources +++ b/e2e-test/resources @@ -1 +1 @@ -Subproject commit 4076071046fd6378d655f223f5afb49de7e27b3c +Subproject commit c2a7b4ffe3089958421c0402473ca86f8a99e4f7 diff --git a/rdmfs/tests/test_inode.py b/rdmfs/tests/test_inode.py index 1ed400f..f03f640 100644 --- a/rdmfs/tests/test_inode.py +++ b/rdmfs/tests/test_inode.py @@ -164,7 +164,7 @@ async def test_list_all_projects_creates_virtual_root(): response_linked_meta.json.return_value = linked_metadata_payload storage_response = MagicMock() storage_response.status_code = 200 - storage_response.json.return_value = {'data': []} + storage_response.json.return_value = {'data': [], 'links': {'next': None}} mock_osf.session.get = AsyncMock(return_value=storage_response) responses = [ @@ -310,7 +310,7 @@ async def test_list_all_projects_handles_pagination(): storage_response = MagicMock() storage_response.status_code = 200 - storage_response.json.return_value = {'data': []} + storage_response.json.return_value = {'data': [], 'links': {'next': None}} mock_osf.session.get = AsyncMock(return_value=storage_response) mock_osf._get = AsyncMock(side_effect=[response_page1, response_page2, response_meta1, response_meta2]) mock_osf._json = MagicMock(side_effect=lambda resp, status: resp.json())