Simplify test-backup module syntax

Author: sinclert-canonical

tests/unit/test_backups.py

@@ -2,7 +2,7 @@
 # See LICENSE file for licensing details.
 
 import unittest
-from unittest.mock import MagicMock, PropertyMock, patch
+from unittest.mock import MagicMock, patch
 
 from charms.mysql.v0.mysql import (
     MySQLConfigureInstanceError,
@@ -285,7 +285,7 @@ def test_on_create_backup_failure(
         # test failure with _can_unit_perform_backup
         _can_unit_perform_backup.return_value = False, "can unit perform backup failure"
         event = MagicMock()
-        type(event).params = PropertyMock(return_value={"force": False})
+        event.params = {"force": False}
         self.charm.unit.status = ActiveStatus()
 
         self.mysql_backups._on_create_backup(event)
@@ -296,7 +296,7 @@ def test_on_create_backup_failure(
         # test failure with _can_cluster_perform_backup
         _can_cluster_perform_backup.return_value = False, "can cluster perform backup failure"
         event = MagicMock()
-        type(event).params = PropertyMock(return_value={"force": False})
+        event.params = {"force": False}
         self.charm.unit.status = ActiveStatus()
 
         self.mysql_backups._on_create_backup(event)
@@ -589,10 +589,7 @@ def test_pre_restore_checks(
     ):
         """Test _pre_restore_checks()."""
         event_mock = MagicMock()
-        type(event_mock).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
+        event_mock.params = {"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
         self.assertTrue(self.mysql_backups._pre_restore_checks(event_mock))
 
     @patch("mysql_vm_helpers.MySQL.is_server_connectable", return_value=True)
@@ -610,51 +607,32 @@ def test_pre_restore_checks_failure(
         # test more than one planned units
         self.harness.add_relation_unit(self.peer_relation_id, "mysql/1")
         event = MagicMock()
-        type(event).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
+        event.params = {"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
         self.assertFalse(self.mysql_backups._pre_restore_checks(event))
 
         self.harness.remove_relation_unit(self.peer_relation_id, "mysql/1")
 
         # test unit in blocked state
         _is_unit_busy.return_value = True
         event = MagicMock()
-        type(event).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
+        event.params = {"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
         self.assertFalse(self.mysql_backups._pre_restore_checks(event))
 
         # test mysqld not running
         _is_server_connectable.return_value = False
         event = MagicMock()
-        type(event).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
+        event.params = {"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
         self.assertFalse(self.mysql_backups._pre_restore_checks(event))
 
         # test missing backup-id
         event = MagicMock()
-        type(event).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
-        params_mock = {}
-        with patch.dict(params_mock, {}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.assertFalse(self.mysql_backups._pre_restore_checks(event))
+        event.params = {}
+        self.assertFalse(self.mysql_backups._pre_restore_checks(event))
 
         # test missing s3-integrator relation
         self.harness.remove_relation(self.s3_integrator_id)
         event = MagicMock()
-        type(event).params = PropertyMock(
-            return_value={"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
-        )
-
+        event.params = {"restore-to-time": "2025-02-10 12:30:30", "backup-id": "test-id"}
         self.assertFalse(self.mysql_backups._pre_restore_checks(event))
 
     @patch("charm.MySQLOperatorCharm._on_update_status")
@@ -681,12 +659,8 @@ def test_on_restore(
     ):
         """Test _on_restore()."""
         event = MagicMock()
-        params_mock = {}
-
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         expected_s3_parameters = {"path": "/path"}
 
@@ -729,11 +703,8 @@ def test_on_restore_failure(
         _post_restore.return_value = (False, "post restore error")
 
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("post restore error")
@@ -742,11 +713,8 @@ def test_on_restore_failure(
         _restore.return_value = (False, True, "restore error")
 
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("restore error")
@@ -758,11 +726,8 @@ def test_on_restore_failure(
         _restore.return_value = (False, False, "restore error")
 
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("restore error")
@@ -772,11 +737,8 @@ def test_on_restore_failure(
         # test failure of _pre_restore()
         _pre_restore.return_value = (False, "pre restore error")
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("pre restore error")
@@ -785,11 +747,8 @@ def test_on_restore_failure(
         _fetch_and_check_existence_of_s3_path.return_value = False
 
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("Invalid backup-id: test-backup-id")
@@ -798,11 +757,8 @@ def test_on_restore_failure(
         _retrieve_s3_parameters.return_value = ({}, ["bucket"])
 
         event = MagicMock()
-        params_mock = {}
-        with patch.dict(params_mock, {"backup-id": "test-backup-id"}):
-            type(event).params = PropertyMock(return_value=params_mock)
-
-            self.mysql_backups._on_restore(event)
+        event.params = {"backup-id": "test-backup-id"}
+        self.mysql_backups._on_restore(event)
 
         event.set_results.assert_not_called()
         event.fail.assert_called_once_with("Missing S3 parameters: ['bucket']")