Fix unit tests with FileSystemStorage

kobo/apps/openrosa/apps/logger/tests/models/test_attachment.py

@@ -12,6 +12,7 @@
     default_kobocat_storage as default_storage,
 )
 
+
 class TestAttachment(TestBase):
 
     def setUp(self):

kobo/apps/openrosa/libs/utils/image_tools.py

@@ -72,11 +72,10 @@ def _save_thumbnails(image, original_path, size, suffix):
 
 def resize(filename):
     image = None
-
     if isinstance(default_storage, FileSystemStorage):
         path = default_storage.path(filename)
         image = Image.open(path)
-        original_path = path
+        original_path = filename
     else:
         path = default_storage.url(filename)
         original_path = filename

kobo/settings/testing.py

@@ -52,10 +52,3 @@
 TEST_USERNAME = 'bob'
 
 OPENROSA_DB_ALIAS = DEFAULT_DB_ALIAS
-
-# STORAGES['default']['BACKEND'] = 'django.core.files.storage.FileSystemStorage'
-# KOBOCAT_DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-# KOBOCAT_MEDIA_ROOT = os.environ.get(
-#     'KOBOCAT_MEDIA_ROOT', MEDIA_ROOT.replace('kpi', 'kobocat')
-# )
-# PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']

kpi/tests/api/v1/test_api_submissions.py

@@ -90,15 +90,15 @@ def test_list_submissions_as_owner_with_params(self):
                 'limit': 5,
                 'sort': '{"q1": -1}',
                 'fields': '["q1", "_submitted_by"]',
-                'query': '{"_submitted_by": {"$in": ["unknown", "someuser", "another"]}}',
+                'query': '{"_submitted_by": {"$in": ["unknownuser", "someuser", "anotheruser"]}}',
             }
         )
         # ToDo add more assertions. E.g. test whether sort, limit, start really work
         self.assertEqual(len(response.data), 5)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
     def test_delete_submission_as_owner(self):
-        submission = self.get_random_submission(self.asset.owner)
+        submission = self.submissions_submitted_by_someuser[0]
         url = reverse(
             self._get_endpoint('submission-detail'),
             kwargs={
@@ -116,7 +116,7 @@ def test_delete_submission_as_owner(self):
     def test_delete_submission_shared_as_anotheruser(self):
         self.asset.assign_perm(self.anotheruser, PERM_VIEW_SUBMISSIONS)
         self._log_in_as_another_user()
-        submission = self.get_random_submission(self.asset.owner)
+        submission = self.submissions_submitted_by_someuser[0]
         url = reverse(
             self._get_endpoint('submission-detail'),
             kwargs={

kpi/tests/api/v2/test_api_attachments.py

@@ -211,7 +211,9 @@ def test_duplicate_attachment_with_submission(self):
         duplicate_file = response.data
 
         # Ensure that the files are the same
-        assert original_file.read() == duplicate_file.read()
+        with default_storage.open(str(original_file), 'rb') as of:
+            with default_storage.open(str(duplicate_file), 'rb') as df:
+                assert of.read() == df.read()
 
     def test_xpath_not_found(self):
         query_dict = QueryDict('', mutable=True)