tests + fixes make_lock_id

Author: marcoacierno

backend/pycon/celery_utils.py

@@ -34,16 +34,14 @@ def make_lock_id(func, *args, **kwargs):
             arg = str(arg)
         hash.update(arg.encode("utf-8"))
 
-    for key, value in kwargs.items():
-        if not isinstance(key, str):
-            key = str(key)
+    for kwarg_key, kwarg_value in kwargs.items():
+        if not isinstance(kwarg_key, str):
+            kwarg_key = str(kwarg_key)
 
-        if not isinstance(value, str):
-            value = str(value)
+        if not isinstance(kwarg_value, str):
+            kwarg_value = str(kwarg_value)
 
-        key = key.encode("utf-8")
-        value = value.encode("utf-8")
-        hash.update(f"{key}={value}".encode("utf-8"))
+        hash.update(f"{kwarg_key}={kwarg_value}".encode("utf-8"))
 
     if args or kwargs:
         key = f"{key}_{hash.hexdigest()}"

backend/pycon/tests/test_celery_utils.py

@@ -18,6 +18,10 @@ def test_make_lock_id(mocker):
     args_md5 = hashlib.md5("123".encode("utf-8")).hexdigest()
     assert key == f"celery_lock_pycon.tests.test_celery_utils_test_func_{args_md5}"
 
+    key = make_lock_id(test_func, 1, arg1="abc")
+    args_md5 = hashlib.md5("1arg1=abc".encode("utf-8")).hexdigest()
+    assert key == f"celery_lock_pycon.tests.test_celery_utils_test_func_{args_md5}"
+
     mocker.patch.dict(os.environ, {"PYTEST_XDIST_WORKER": "1"})
     key = make_lock_id(test_func)
     assert key == "celery_lock_pycon.tests.test_celery_utils_test_func_1"

backend/pycon/tests/test_storage.py

@@ -1,7 +1,11 @@
 from unittest import mock
 from files_upload.models import File
 from files_upload.tests.factories import FileFactory
-from pycon.storages import CustomFileSystemStorage, CustomS3Boto3Storage
+from pycon.storages import (
+    CustomFileSystemStorage,
+    CustomS3Boto3Storage,
+    PrivateCustomS3Boto3Storage,
+)
 
 
 def test_s3_storage_generate_public_upload_url(mocker):
@@ -41,3 +45,9 @@ def test_local_storage_generate_upload_url():
     assert f"local_files_upload/{file.id}" in return_value.url
     assert return_value.fields == {}
     assert return_value.fields_as_json == "{}"
+
+
+def test_private_storage_removes_cache_control_params():
+    storage = PrivateCustomS3Boto3Storage()
+    params = storage.get_object_parameters("test.pdf")
+    assert "CacheControl" not in params