Strengthen release assertion and add cleanup guards in lock tests

Author: mn-ram

openwisp_controller/connection/tests/test_models.py

@@ -1066,34 +1066,35 @@ def test_device_update_config_not_in_progress(
             conf.save()
             mocked_get_working_connection.assert_called_once()
             mocked_update_config.assert_called_once()
-            mocked_release.assert_called_once()
+            mocked_release.assert_called_once_with(
+                str(conf.device.pk), "fake-lock-token"
+            )
 
     def test_acquire_update_config_lock(self):
         """Test that the lock can be acquired and prevents duplicate acquisition."""
         device_id = "test-device-id"
         # First acquisition should succeed and return a token
         token = _acquire_update_config_lock(device_id)
+        self.addCleanup(_release_update_config_lock, device_id, token)
         self.assertIsNotNone(token)
         # Second acquisition should fail (lock already held)
         self.assertIsNone(_acquire_update_config_lock(device_id))
         # After releasing with correct token, acquisition should succeed again
         _release_update_config_lock(device_id, token)
         token2 = _acquire_update_config_lock(device_id)
+        self.addCleanup(_release_update_config_lock, device_id, token2)
         self.assertIsNotNone(token2)
-        # Cleanup
-        _release_update_config_lock(device_id, token2)
 
     def test_release_update_config_lock_wrong_token(self):
         """Only the lock owner can release the lock."""
         device_id = "test-device-id"
         token = _acquire_update_config_lock(device_id)
+        self.addCleanup(_release_update_config_lock, device_id, token)
         self.assertIsNotNone(token)
         # Releasing with wrong token should not delete the lock
         _release_update_config_lock(device_id, "wrong-token")
         # Lock should still be held
         self.assertIsNone(_acquire_update_config_lock(device_id))
-        # Releasing with correct token should work
-        _release_update_config_lock(device_id, token)
 
     @mock.patch(_connect_path)
     def test_schedule_command_called(self, connect_mocked):