[Fix] Update tests to match latest changes #1049

Fixed all failing tests that were failing due to inconsistencies with recent
updates in notification handling, logging, and retry mechanisms.

Fixes #1049

Author: stktyagi

openwisp_controller/config/tasks_zerotier.py

@@ -1,12 +1,8 @@
 import logging
 from http import HTTPStatus
-from time import sleep
 
 from celery import shared_task
-from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
-from django.utils.translation import gettext as _
-from openwisp_notifications.signals import notify
 from requests.exceptions import RequestException
 from swapper import load_model
 

openwisp_controller/config/tests/test_notifications.py

@@ -31,7 +31,9 @@ class TestNotifications(
     app_label = "config"
     _ZT_SERVICE_REQUESTS = "openwisp_controller.config.api.zerotier_service.requests"
     _ZT_API_TASKS_INFO_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.info"
-    _ZT_API_TASKS_WARN_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.warn"
+    _ZT_API_TASKS_WARN_LOGGER = (
+        "openwisp_controller.config.tasks_zerotier.logger.warning"
+    )
     _ZT_API_TASKS_ERR_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.error"
     # As the locmem cache does not support the redis backend cache.keys() method
     _ZT_API_TASKS_LOCMEM_CACHE_KEYS = f"{settings.CACHES['default']['BACKEND']}.keys"

openwisp_controller/config/tests/test_vpn.py

@@ -9,7 +9,6 @@
 from django.core.exceptions import ValidationError
 from django.db.models.signals import post_save
 from django.db.utils import IntegrityError
-from django.http.response import HttpResponse, HttpResponseNotFound
 from django.test import TestCase, TransactionTestCase
 from requests.exceptions import ConnectionError, RequestException, Timeout
 from swapper import load_model
@@ -828,6 +827,9 @@ def test_update_vpn_server_configuration(self):
                     f"Cannot update configuration of {vpn.name} VPN server, "
                     "webhook endpoint and authentication token are empty."
                 )
+        success_response = mock.Mock(spec=requests.Response)
+        success_response.status_code = 200
+        success_response.raise_for_status = mock.Mock()
 
         with self.subTest("Webhook endpoint and authentication endpoint is present"):
             vpn.webhook_endpoint = "https://example.com"
@@ -838,24 +840,29 @@ def test_update_vpn_server_configuration(self):
             with mock.patch(
                 "openwisp_controller.config.tasks.logger.info"
             ) as mocked_logger, mock.patch(
-                "requests.post", return_value=HttpResponse()
+                "requests.post", return_value=success_response
             ):
                 post_save.send(
                     instance=vpn_client, sender=vpn_client._meta.model, created=False
                 )
                 mocked_logger.assert_called_once_with(
                     f"Triggered update webhook of VPN Server UUID: {vpn.pk}"
                 )
+            fail_response = mock.Mock(spec=requests.Response)
+            fail_response.status_code = 404
+            fail_response.raise_for_status.side_effect = requests.exceptions.HTTPError(
+                "Not Found"
+            )
 
-            with mock.patch("logging.Logger.error") as mocked_logger, mock.patch(
-                "requests.post", return_value=HttpResponseNotFound()
+            with mock.patch("logging.Logger.warning") as mocked_logger, mock.patch(
+                "requests.post", return_value=fail_response
             ):
                 post_save.send(
                     instance=vpn_client, sender=vpn_client._meta.model, created=False
                 )
                 mocked_logger.assert_called_once_with(
                     "Failed to update VPN Server configuration. "
-                    f"Response status code: 404, VPN Server UUID: {vpn.pk}"
+                    f"Error: Not Found, VPN Server UUID: {vpn.pk}"
                 )
 
     def test_vpn_peers_changed(self):
@@ -1467,7 +1474,9 @@ class TestZeroTierTransaction(
 ):
     _ZT_SERVICE_REQUESTS = "openwisp_controller.config.api.zerotier_service.requests"
     _ZT_API_TASKS_INFO_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.info"
-    _ZT_API_TASKS_WARN_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.warn"
+    _ZT_API_TASKS_WARN_LOGGER = (
+        "openwisp_controller.config.tasks_zerotier.logger.warning"
+    )
     _ZT_API_TASKS_ERR_LOGGER = "openwisp_controller.config.tasks_zerotier.logger.error"
     # As the locmem cache does not support the redis backend cache.keys() method
     _ZT_API_TASKS_LOCMEM_CACHE_KEYS = f"{settings.CACHES['default']['BACKEND']}.keys"

openwisp_controller/config/utils.py

@@ -7,8 +7,6 @@
 from django.shortcuts import get_object_or_404 as base_get_object_or_404
 from django.urls import path, re_path
 from django.utils.translation import gettext_lazy as _
-
-# from time import sleep
 from openwisp_notifications.signals import notify
 from openwisp_notifications.utils import _get_object_link