tidy up tests

Author: thomasf

tests/test_app/tests/bucket_tests.py

@@ -29,7 +29,7 @@ def test_static_storage_cannot_be_initialized_without_bucket(self):
         with self.assertRaises(OSError):
             MinioStaticStorage()
 
-    def test_get_setting_throws_early(self):
+    def test_get_setting_raises_exception(self):
         with self.assertRaises(ImproperlyConfigured):
             get_setting("INEXISTENT_SETTING")
 

tests/test_app/tests/custom_storage_class_tests.py

@@ -19,18 +19,18 @@
 
 
 @deconstructible
-class SecretStorage(MinioStorage):
-    """The SecretStorage MinioStorage subclass can be used directly, as a storage in
+class PrivateStorage(MinioStorage):
+    """The PrivateStorage MinioStorage subclass can be used directly, as a storage in
     settings.DEFAULT_FILE_STORAGE or after instantiated used individually on any django
     FileField:
 
     from django.db import models
 
-    ss = SecretStorage(bucket_name='invoices')
+    private_storage = PrivateStorage(bucket_name='invoices')
 
     class Invoice(models.Model):
         ...
-        pdf = models.FileField(storage=ss)
+        pdf = models.FileField(storage=private_storage)
 
     """
 
@@ -51,7 +51,7 @@ def __init__(self, bucket_name=None):
         # or use our own Django setting
         #
         if bucket_name is None:
-            bucket_name = get_setting("SECRET_BUCKET_NAME")
+            bucket_name = get_setting("PRIVATE_BUCKET_NAME")
 
         # Run the super constructor and make a choice to only use presigned urls with
         # this bucket so that we can keep files more private here than how media files
@@ -67,12 +67,12 @@ def __init__(self, bucket_name=None):
 
 
 class CustomStorageTests(BaseTestMixin, TestCase):
-    @override_settings(SECRET_BUCKET_NAME=create_test_bucket_name("my-secret-bucket"))
+    @override_settings(PRIVATE_BUCKET_NAME=create_test_bucket_name("my-private-bucket"))
     def test_custom_storage(self):
         # Instansiate a storage class and put a file in it so that we have something to
         # work with.
         #
-        storage = SecretStorage()
+        storage = PrivateStorage()
         storage_filename = storage.save("secret.txt", ContentFile(b"abcd"))
 
         # Create a temporary workspace directory.

tests/test_app/tests/retrieve_tests.py

@@ -1,15 +1,13 @@
 import datetime
 import io
 import os
-import unittest
 
 import requests
 from django.core.files.base import ContentFile
 from django.test import TestCase, override_settings
 from freezegun import freeze_time
 from minio.error import S3Error
 
-from minio_storage.errors import MinIOError
 from minio_storage.storage import MinioMediaStorage
 
 from .utils import BaseTestMixin
@@ -41,7 +39,7 @@ def test_file_size(self):
         test_file = self.media_storage.save("sizetest.txt", ContentFile(b"1234"))
         self.assertEqual(4, self.media_storage.size(test_file))
 
-    def test_size_of_non_existent_throws(self):
+    def test_size_of_non_existent_raises_exception(self):
         test_file = self.media_storage.save("sizetest.txt", ContentFile(b"1234"))
         self.media_storage.delete(test_file)
         with self.assertRaises(S3Error):
@@ -62,7 +60,7 @@ def test_created_time(self):
             self.media_storage.created_time(self.new_file), datetime.datetime
         )
 
-    def test_modified_time_of_non_existent_throws(self):
+    def test_modified_time_of_non_existent_raises_exception(self):
         with self.assertRaises(S3Error):
             self.media_storage.modified_time("nonexistent.jpg")
 
@@ -116,19 +114,10 @@ def test_file_exists(self):
     def test_file_exists_failure(self):
         self.assertFalse(self.media_storage.exists("nonexistent.txt"))
 
-    @unittest.skip("Skipping this test because undecided if it should raise exception")
-    def test_opening_non_existing_file_raises_oserror(self):
-        with self.assertRaises(OSError):
-            self.media_storage.open("this does not exist")
-
-    @unittest.skip("Skipping this test because undecided if it should raise exception")
-    def test_opening_non_existing_file_raises_minioerror(self):
-        with self.assertRaises(MinIOError):
-            self.media_storage.open("this does not exist")
-        try:
-            self.media_storage.open("this does not exist")
-        except MinIOError as e:
-            assert e.cause.__class__ == S3Error
+    def test_reading_non_existing_file_raises_exception(self):
+        with self.assertRaises(Exception):
+            f = self.media_storage.open("this does not exist")
+            f.read()
 
     def test_file_names_are_properly_sanitized(self):
         self.media_storage.save("./meh22222.txt", io.BytesIO(b"stuff"))

tests/test_app/tests/upload_tests.py

@@ -66,15 +66,6 @@ def test_files_seekable(self):
     def test_upload_and_get_back_file_with_funky_name(self):
         self.media_storage.save("áčďěščřžýŽŇůúť.txt", ContentFile(b"12345"))
 
-    def test_uploaded_and_downloaded_file_sizes_match(self):
-        pass
-
-    def test_uploaded_files_end_up_in_the_right_bucket(self):
-        pass
-
-    def test_static_files_end_up_in_the_right_bucket(self):
-        pass
-
     def test_upload_file_beggining_with_dot(self):
         self.media_storage.save(
             ".hidden_file", ContentFile(b"Not really, but whatever")