[tests] Fixed failing tests

Author: pandafy

openwisp_controller/config/base/config.py

@@ -589,9 +589,8 @@ def save(self, *args, **kwargs):
             self._old_backend = None
         # emit signals if config is modified and/or if status is changing
         if not created and self._send_config_modified_after_save:
-            self._send_config_modified_signal(action=self._config_modified_action)
+            self._send_config_modified_signal()
             self._send_config_modified_after_save = False
-            self._config_modified_action = "config_changed"
         if self._send_config_status_changed:
             self._send_config_status_changed_signal()
             self._send_config_status_changed = False
@@ -651,6 +650,14 @@ def update_status_if_checksum_changed(
                     self._update_checksum_db(new_checksum=self.checksum_db)
                 if send_config_modified_signal:
                     self._send_config_modified_after_save = True
+                    if save:
+                        # When this method is triggered by changes to Config.templates,
+                        # those changes are applied through the related manager rather
+                        # than via Config.save(). As a result, the model's save()
+                        # method (and thus the automatic "config modified" signal)
+                        # is never invoked. To ensure the signal is still emitted,
+                        # we send it explicitly here.
+                        self._send_config_modified_signal()
             self.invalidate_checksum_cache()
         return checksum_changed
 
@@ -695,13 +702,24 @@ def _set_config_modified_timeout_cache(self):
     def _delete_config_modified_timeout_cache(self):
         cache.delete(self._config_modified_timeout_cache_key)
 
-    def _send_config_modified_signal(self, action):
+    def _send_config_modified_signal(self, action=None):
         """
         Emits ``config_modified`` signal.
-        Called also by Template when templates of a device are modified
+
+        A short-lived cache key (``_CONFIG_MODIFIED_TIMEOUT``)
+        prevents emitting duplicate signals inside the same logical window;
+        if that key exists the method returns early without emitting.
+
+        Side effects
+        ------------
+        - Emits the ``config_modified`` Django signal with contextual data.
+        - Resets ``_config_modified_action`` back to ``"config_changed"`` so
+            subsequent calls without an explicit action revert to the default.
+        - Sets the debouncing cache key to avoid duplicate emissions.
         """
-        if cache.get(self._config_modified_timeout_cache_key) is not None:
+        if cache.get(self._config_modified_timeout_cache_key):
             return
+        action = action or self._config_modified_action
         assert action in [
             "config_changed",
             "related_template_changed",
@@ -721,6 +739,7 @@ def _send_config_modified_signal(self, action):
             True,
             timeout=self._CONFIG_MODIFIED_TIMEOUT,
         )
+        self._config_modified_action = "config_changed"
 
     def _send_config_deactivating_signal(self):
         """

openwisp_controller/connection/tests/test_models.py

@@ -959,6 +959,7 @@ def _assert_applying_conf_test_command(mocked_exec):
 
         conf = self._prepare_conf_object()
 
+        conf._delete_config_modified_timeout_cache()
         with self.subTest("Unable to get openwisp-config version"):
             with mock.patch(_exec_command_path) as mocked_exec_command:
                 mocked_exec_command.return_value = self._exec_command_return_value(
@@ -970,6 +971,7 @@ def _assert_applying_conf_test_command(mocked_exec):
             conf.refresh_from_db()
             self.assertEqual(conf.status, "modified")
 
+        conf._delete_config_modified_timeout_cache()
         with self.subTest("openwisp_config >= 0.6.0a"):
             conf.config = '{"dns_servers": []}'
             conf.full_clean()
@@ -985,6 +987,7 @@ def _assert_applying_conf_test_command(mocked_exec):
             conf.refresh_from_db()
             self.assertEqual(conf.status, "modified")
 
+        conf._delete_config_modified_timeout_cache()
         with self.subTest("openwisp_config < 0.6.0a: exit_code 0"):
             conf.config = '{"interfaces": [{"name": "eth00","type": "ethernet"}]}'
             conf.full_clean()
@@ -999,6 +1002,7 @@ def _assert_applying_conf_test_command(mocked_exec):
             conf.refresh_from_db()
             self.assertEqual(conf.status, "modified")
 
+        conf._delete_config_modified_timeout_cache()
         with self.subTest("openwisp_config < 0.6.0a: exit_code 1"):
             conf.config = '{"radios": []}'
             conf.full_clean()