SIENTIAPDE-1307: Refactor: Remove redundant patching of SientiaMonitoring and Postgres init in tests, and add shutdown mock to metrics controller.

tests/activities/test_training.py

@@ -22,7 +22,14 @@ def mock_notification_handler():
 @pytest.fixture
 def mock_metrics_controller():
     """Create a mock metrics controller."""
-    return MagicMock()
+    controller = MagicMock()
+
+    # Make shutdown an async coroutine
+    async def mock_shutdown():
+        pass
+
+    controller.shutdown = mock_shutdown
+    return controller
 
 
 @pytest.fixture
@@ -50,11 +57,9 @@ def mock_train_params():
     return params
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_training_init(
     mock_training_repo,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -72,21 +77,17 @@ def test_training_init(
         metrics_controller=mock_metrics_controller,
     )
 
-    mock_base_init.assert_called_once_with(
-        mock_logger, mock_notification_handler, mock_metrics_controller, set_error_counter=True
-    )
     mock_training_repo.assert_called_once_with(mock_logger)
     assert training.model_repository is mock_model_repository
     assert training.storage_repository is mock_storage_repository
+    assert training.metrics_controller is mock_metrics_controller
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 @patch('model_manager.activities.training.TrainModelParams')
 def test_validate_train_params_success(
     mock_train_params_class,
     mock_training_repo,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -122,13 +123,11 @@ def test_validate_train_params_success(
     training.info.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 @patch('model_manager.activities.training.TrainModelParams')
 def test_validate_train_params_value_error(
     mock_train_params_class,
     mock_training_repo,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -160,13 +159,11 @@ def test_validate_train_params_value_error(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 @patch('model_manager.activities.training.TrainModelParams')
 def test_validate_train_params_type_error(
     mock_train_params_class,
     mock_training_repo,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -198,13 +195,11 @@ def test_validate_train_params_type_error(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 @patch('model_manager.activities.training.TrainModelParams')
 def test_validate_train_params_key_error(
     mock_train_params_class,
     mock_training_repo,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -236,11 +231,9 @@ def test_validate_train_params_key_error(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_train_model_success_with_params_object(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -286,13 +279,11 @@ def test_train_model_success_with_params_object(
     mock_model_repository.save_model.assert_called_once_with(mock_train_result)
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 @patch('model_manager.activities.training.TrainModelParams')
 def test_train_model_success_with_params_dict(
     mock_train_params_class,
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -334,11 +325,9 @@ def test_train_model_success_with_params_dict(
     mock_train_params_class.from_dict.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_train_model_training_fails(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -376,11 +365,9 @@ def test_train_model_training_fails(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_train_model_save_fails(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -422,11 +409,9 @@ def test_train_model_save_fails(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_cleanup_resources_success(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -457,11 +442,9 @@ def test_cleanup_resources_success(
     mock_storage_repository.delete_file.assert_called_once_with('test-bucket', 'test-file.csv')
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_cleanup_resources_cleanup_fails(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,
@@ -495,11 +478,9 @@ def test_cleanup_resources_cleanup_fails(
     training.send_notification.assert_called_once()
 
 
-@patch('model_manager.activities.training.SientiaMonitoring.__init__', return_value=None)
 @patch('model_manager.activities.training.TrainingRepository')
 def test_cleanup_resources_with_empty_values(
     mock_training_repo_class,
-    mock_base_init,
     mock_model_repository,
     mock_storage_repository,
     mock_logger,