Skip to content

Fix gallery upload tests broken by Session/HTTPError changes #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mKowalski256 merged 1 commit into from
Aug 24, 2026
Merged

Fix gallery upload tests broken by Session/HTTPError changes #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions rspace_client/tests/eln_fs_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from unittest.mock import patch, MagicMock, ANY
import unittest
import requests
from rspace_client.eln.fs import (
path_to_id,
GalleryFilesystem,
Expand All @@ -18,7 +19,7 @@ def mock_failed_upload_post(url, *args, **kwargs):
mock_response.json.return_value = {
'message': 'File type not allowed in this folder', 'errors': []
}
mock_response.raise_for_status.side_effect = Exception('400 Bad Request')
mock_response.raise_for_status.side_effect = requests.HTTPError('400 Bad Request')
return mock_response


Expand Down Expand Up @@ -261,8 +262,8 @@ def test_classify_media_section(self):
self.assertIsNone(classify_media_section('noextension'))
self.assertIsNone(classify_media_section(None))

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.post', side_effect=mock_failed_upload_post)
@patch('requests.Session.get', side_effect=mock_requests_get)
@patch('requests.Session.post', side_effect=mock_failed_upload_post)
def test_upload_wrong_section_raises_mismatch(self, mock_post, mock_get):
# Folder GF123 is in the 'Images' section (see mock_requests_get);
# uploading a PDF there is rejected by the server.
Expand All @@ -279,8 +280,8 @@ def test_upload_wrong_section_raises_mismatch(self, mock_post, mock_get):
# the original server message is preserved
self.assertIn('File type not allowed', str(err))

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.post', side_effect=mock_failed_upload_post)
@patch('requests.Session.get', side_effect=mock_requests_get)
@patch('requests.Session.post', side_effect=mock_failed_upload_post)
def test_upload_wrong_section_miscellaneous_file(self, mock_post, mock_get):
# A .zip has no specialised section; it belongs in Miscellaneous, so
# uploading it into the Images folder is a mismatch.
Expand All @@ -293,7 +294,7 @@ def test_upload_wrong_section_miscellaneous_file(self, mock_post, mock_get):
self.assertEqual('Miscellaneous', err.file_media_type)
self.assertIn('Miscellaneous', str(err))

@patch('requests.post', side_effect=mock_failed_upload_post)
@patch('requests.Session.post', side_effect=mock_failed_upload_post)
def test_upload_no_folder_reraises_original(self, mock_post):
# With no target folder the server auto-routes; a failure here is not a
# section mismatch and must surface unchanged.
Expand All @@ -302,8 +303,8 @@ def test_upload_no_folder_reraises_original(self, mock_post):
self.fs.upload('', file_obj)
self.assertNotIsInstance(ctx.exception, GallerySectionMismatch)

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.post', side_effect=mock_success_upload_post)
@patch('requests.Session.get', side_effect=mock_requests_get)
@patch('requests.Session.post', side_effect=mock_success_upload_post)
def test_upload_success_returns_placement(self, mock_post, mock_get):
file_obj = BytesIO(b'x')
file_obj.name = 'a.pdf'
Expand All @@ -314,8 +315,8 @@ def test_upload_success_returns_placement(self, mock_post, mock_get):
self.assertEqual('GF123', placement.folder_global_id)
self.assertEqual('/GF123', placement.requested_path)

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.post', side_effect=mock_reroute_upload_post)
@patch('requests.Session.get', side_effect=mock_requests_get)
@patch('requests.Session.post', side_effect=mock_reroute_upload_post)
def test_upload_reroute_per_call_override(self, mock_post, mock_get):
# self.fs defaults to "raise"; override to "reroute" on the call.
file_obj = BytesIO(b'%PDF-1.4 fake')
Expand All @@ -332,8 +333,8 @@ def test_upload_reroute_per_call_override(self, mock_post, mock_get):
self.assertEqual({'folderId': 123}, mock_post.call_args_list[0].kwargs['data'])
self.assertEqual({}, mock_post.call_args_list[1].kwargs['data'])

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.post', side_effect=mock_reroute_upload_post)
@patch('requests.Session.get', side_effect=mock_requests_get)
@patch('requests.Session.post', side_effect=mock_reroute_upload_post)
def test_upload_reroute_constructor_policy(self, mock_post, mock_get):
reroute_fs = GalleryFilesystem('https://example.com', 'api_key', on_mismatch='reroute')
file_obj = BytesIO(b'%PDF-1.4 fake')
Expand All @@ -353,7 +354,7 @@ def test_upload_tolerates_upload_file_returning_none(self):
self.assertEqual('Gallery', placement.path)
self.fs.eln_client.upload_file.assert_called_once()

@patch('requests.get', side_effect=mock_requests_get)
@patch('requests.Session.get', side_effect=mock_requests_get)
def test_invalid_constructor_policy_rejected(self, mock_get):
with self.assertRaises(ValueError):
GalleryFilesystem('https://example.com', 'api_key', on_mismatch='bogus')
Expand Down
Loading