fix: get_minicroft leaks MiniCroft on BaseException during boot

ovoscope/__init__.py

@@ -1,17 +1,17 @@
 import inspect
 import dataclasses
 import gc
 import json
 import threading
 from copy import deepcopy
 from time import sleep, time
 from typing import Union, List, Dict, Any, Optional
 
 from ovos_bus_client.message import Message
 from ovos_bus_client.session import SessionManager, Session
 from ovos_config.config import Configuration
 from ovos_config.models import LocalConf
 from ovos_core.intent_services import IntentService
 from ovos_core.skill_manager import SkillManager
 from ovos_plugin_manager.skills import find_skill_plugins
 from ovos_utils.fakebus import FakeBus
@@ -21,8 +21,8 @@
 from ovos_workshop.skills.api import SkillApi
 from ovos_workshop.skills.ovos import OVOSSkill
 
 SerializedMessage = Dict[str, Union[str, Dict[str, Any]]]
 SerializedTest = Dict[str, Union[str, bool, List[str], SerializedMessage]]
 
 DEFAULT_IGNORED = ["ovos.skills.settings_changed"]
 GUI_IGNORED = ["gui.clear.namespace",
@@ -978,7 +978,10 @@
                 )
             sleep(0.1)
         return croft
-    except Exception:
+    except BaseException:
+        # pytest-timeout's Failed and KeyboardInterrupt derive from
+        # BaseException, not Exception; catching only Exception here let
+        # them skip cleanup and leak the started MiniCroft process.
         croft.stop()
         raise
 

test/unittests/test_minicroft.py

@@ -1,6 +1,7 @@
 """Unit tests for MiniCroft and get_minicroft()."""
 import threading
 import unittest
+from unittest.mock import patch
 
 from ovos_bus_client.message import Message
 from ovos_spec_tools import SpecMessage
@@ -83,6 +84,18 @@ def test_returns_minicroft_instance(self):
         finally:
             mc.stop()
 
+    def test_basedexception_during_boot_still_stops_croft(self):
+        """A BaseException (e.g. pytest-timeout's Failed, or a real
+        KeyboardInterrupt) raised while waiting for READY must still trigger
+        croft.stop() before propagating. Regression test for get_minicroft's
+        cleanup handler only catching `Exception`, which let BaseException
+        subclasses skip cleanup and leak the started MiniCroft process."""
+        with patch.object(MiniCroft, "start", side_effect=KeyboardInterrupt), \
+             patch.object(MiniCroft, "stop") as mock_stop:
+            with self.assertRaises(KeyboardInterrupt):
+                get_minicroft([])
+            mock_stop.assert_called_once()
+
 
 class TestMiniCroftSessionManagerBusRestore(unittest.TestCase):
     """MiniCroft must not leak its FakeBus into the process-wide