Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions rdmfs/tests/test_inode.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -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())
Expand Down
Loading