Fix failing tests

codingjoe · codingjoe · commit cfe54df2783d · 2022-03-19T12:14:55.000+01:00
diff --git a/s3file/middleware.py b/s3file/middleware.py
@@ -29,7 +29,11 @@ def get_files_from_storage(paths):
         for path in paths:
             path = pathlib.PurePosixPath(path)
             try:
-                f = storage.open(str(path.relative_to(storage.location)))
+                location = storage.aws_location
+            except AttributeError:
+                location = storage.location
+            try:
+                f = storage.open(str(path.relative_to(location)))
                 f.name = path.name
                 yield f
             except (OSError, ValueError):
diff --git a/s3file/storages.py b/s3file/storages.py
@@ -11,11 +11,12 @@
 
 class S3MockStorage(FileSystemStorage):
     @property
-    def location(self):
+    def aws_location(self):
         return getattr(settings, "AWS_LOCATION", "")
 
-    def path(self, name):
-        return safe_join(os.path.abspath(self.base_location), self.location, name)
+    @property
+    def location(self):
+        return safe_join(os.path.abspath(self.base_location), self.aws_location)
 
     class connection:
         class meta:
diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -36,10 +36,11 @@ def freeze(self, monkeypatch):
         """Freeze datetime and UUID."""
         monkeypatch.setattr(
             "s3file.forms.S3FileInputMixin.upload_folder",
-            os.path.join(storage.location, "tmp"),
+            os.path.join(storage.aws_location, "tmp"),
         )
 
     def test_value_from_datadict(self, client, upload_file):
+        print(storage.location)
         with open(upload_file) as f:
             uploaded_file = storage.save("test.jpg", f)
         response = client.post(
@@ -227,7 +228,5 @@ def test_media(self):
         assert ClearableFileInput().media._js == ["s3file/js/s3file.js"]
 
     def test_upload_folder(self):
-        assert ClearableFileInput().upload_folder.startswith(
-            "custom/location/tmp/s3file/"
-        )
-        assert len(ClearableFileInput().upload_folder) == 49
+        assert "custom/location/tmp/s3file/" in ClearableFileInput().upload_folder
+        assert len(os.path.basename(ClearableFileInput().upload_folder)) == 22
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
@@ -14,7 +14,7 @@ def test_get_files_from_storage(self):
             "tmp/s3file/test_get_files_from_storage", ContentFile(content)
         )
         files = S3FileMiddleware.get_files_from_storage(
-            [os.path.join(storage.location, name)]
+            [os.path.join(storage.aws_location, name)]
         )
         file = next(files)
         assert file.read() == content
diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py
@@ -44,7 +44,7 @@
     },
 ]
 
-USE_L10N = True
+USE_TZ = True
 
 AWS_ACCESS_KEY_ID = "testaccessid"
 AWS_SECRET_ACCESS_KEY = "supersecretkey"

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ def test_get_files_from_storage(self):`
`14`	`14`	`"tmp/s3file/test_get_files_from_storage", ContentFile(content)`
`15`	`15`	`)`
`16`	`16`	`files = S3FileMiddleware.get_files_from_storage(`
`17`		`- [os.path.join(storage.location, name)]`
	`17`	`+ [os.path.join(storage.aws_location, name)]`
`18`	`18`	`)`
`19`	`19`	`file = next(files)`
`20`	`20`	`assert file.read() == content`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`},`
`45`	`45`	`]`
`46`	`46`
`47`		`-USE_L10N = True`
	`47`	`+USE_TZ = True`
`48`	`48`
`49`	`49`	`AWS_ACCESS_KEY_ID = "testaccessid"`
`50`	`50`	`AWS_SECRET_ACCESS_KEY = "supersecretkey"`