FIx broken tests due to uncleared cache

kobo/apps/project_ownership/tests/api/v2/test_api.py

@@ -3,6 +3,7 @@
 from constance.test import override_config
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.core.cache import cache
 from django.utils import timezone
 from mock import patch, MagicMock
 from rest_framework import status
@@ -431,6 +432,7 @@ def test_account_usage_transferred_to_new_user(self):
         assert response.status_code == status.HTTP_201_CREATED
 
         # someuser should have no usage reported anymore
+        cache.clear()
         response = self.client.get(service_usage_url)
         assert response.data['total_nlp_usage'] == expected_empty_data['total_nlp_usage']
         assert response.data['total_storage_bytes'] == expected_empty_data['total_storage_bytes']

kpi/tests/api/v2/test_api_service_usage.py

@@ -1,17 +1,11 @@
+from django.core.cache import cache
 from django.urls import reverse
 from rest_framework import status
-from unittest.mock import patch
 
 from kpi.models import Asset
 from kpi.tests.test_usage_calculator import BaseServiceUsageTestCase
 
 
-def clear_mock_cache(self):
-    self._clear_cache()
-
-
-# We need to disable the cache system in some test cases
-@patch('kpi.utils.cache.CachedClass._handle_cache_expiration', clear_mock_cache)
 class ServiceUsageAPITestCase(BaseServiceUsageTestCase):
     def test_anonymous_user(self):
         """
@@ -85,6 +79,7 @@ def test_service_usages_with_projects_in_trash_bin(self):
                 asset.deployment.xform.save(update_fields=['pending_delete'])
 
         # Retry endpoint
+        cache.clear()
         url = reverse(self._get_endpoint('service-usage-list'))
         response = self.client.get(url)
 

kpi/tests/test_usage_calculator.py

@@ -3,6 +3,7 @@
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
+from django.core.cache import cache
 from django.test import override_settings
 from django.urls import reverse
 from django.utils import timezone
@@ -34,6 +35,7 @@ class BaseServiceUsageTestCase(BaseAssetTestCase):
     def setUp(self):
         super().setUp()
         self.client.login(username='anotheruser', password='anotheruser')
+        cache.clear()
 
     @classmethod
     def setUpTestData(cls):

kpi/utils/cache.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from functools import wraps
 
 from django_redis import get_redis_connection
@@ -37,7 +36,8 @@ def wrapper(*args, **kwargs):
 
 class CachedClass:
     """
-    Handles a mapping cache.
+    Handles a mapping cache for a class. It supports only getter methods that
+    receive no parameters but the self.
 
     The inheriting class must define a function _get_cache_hash that creates a
     unique name string for the underlying HSET.