Add test for file not found exception

Author: codingjoe

s3file/middleware.py

@@ -1,7 +1,6 @@
 import logging
 import os
 
-from botocore.exceptions import ClientError
 from django.core.files.storage import default_storage
 
 logger = logging.getLogger('s3file')
@@ -24,9 +23,9 @@ def __call__(self, request):
     def get_files_from_storage(paths):
         """Return S3 file where the name does not include the path."""
         for path in paths:
-            f = default_storage.open(path)
-            f.name = os.path.basename(path)
             try:
+                f = default_storage.open(path)
+                f.name = os.path.basename(path)
                 yield f
-            except ClientError:
+            except OSError:
                 logger.exception("File not found: %s", path)

tests/test_middleware.py

@@ -26,3 +26,9 @@ def test_process_request(self, rf):
         S3FileMiddleware(lambda x: None)(request)
         assert request.FILES.getlist('file')
         assert request.FILES.get('file').read() == b's3file'
+
+    def test_process_request__no_file(self, rf, caplog):
+        request = rf.post('/', data={'file': 'does_not_exist.txt', 's3file': 'file'})
+        S3FileMiddleware(lambda x: None)(request)
+        assert not request.FILES.getlist('file')
+        assert 'File not found: does_not_exist.txt' in caplog.text