Fix message context handling in __handle_stop (#44)

* Fix message context handling in `__handle_stop`

* Add unit test for `BaseSkill.stop`

ovos_workshop/skills/base.py

@@ -1652,8 +1652,8 @@ def __handle_stop(self, message):
         """Handler for the "mycroft.stop" signal. Runs the user defined
         `stop()` method.
         """
-        self.bus.emit(message.forward(self.skill_id + ".stop",
-                                      context={"skill_id": self.skill_id}))
+        message.context['skill_id'] = self.skill_id
+        self.bus.emit(message.forward(self.skill_id + ".stop"))
         try:
             if self.stop():
                 self.bus.emit(message.reply("mycroft.stop.handled",

test/unittests/test_skill.py

@@ -1,5 +1,8 @@
 import json
 import unittest
+from unittest.mock import Mock
+
+from mycroft_bus_client import Message
 
 from ovos_utils.fingerprinting import is_ovos
 from ovos_workshop.skills.ovos import OVOSSkill
@@ -83,5 +86,19 @@ def test_registered_events(self):
             for event in default_ovos:
                 self.assertTrue(event in registered_events)
 
+    def test_stop(self):
+        skill = self.skill.instance
+        handle_stop = Mock()
+        real_stop = skill.stop
+        skill.stop = Mock()
+        self.bus.once(f"{self.skill.skill_id}.stop", handle_stop)
+        self.bus.emit(Message("mycroft.stop"))
+        handle_stop.assert_called_once()
+        self.assertEqual(handle_stop.call_args[0][0].context['skill_id'],
+                         skill.skill_id)
+        skill.stop.assert_called_once()
+
+        skill.stop = real_stop
+
     def tearDown(self) -> None:
         self.skill.unload()