Merge pull request #2263 from forslund/bugfix/reload-deactivated-skill

Fix reload_allowed check

mycroft/skills/skill_loader.py

@@ -94,7 +94,7 @@ class SkillLoader:
 
         reload_allowed = (
                 self.active and
-                instance is None or instance.reload_skill
+                (instance is None or instance.reload_skill)
         )
         return modified and reload_allowed
 

test/unittests/skills/test_skill_loader.py

@@ -64,10 +64,18 @@ class TestSkillLoader(MycroftUnitTestBase):
         """The loader should skip reloads for skill that doesn't allow it."""
         self.loader.instance = MagicMock()
         self.loader.instance.reload_skill = False
-        self.loader.active = False
+        self.loader.active = True
         self.loader.loaded = True
         self.assertFalse(self.loader.reload_needed())
 
+    def test_skill_reloading_deactivated(self):
+        """The loader should skip reloads for skill that aren't active."""
+        self.loader.instance = MagicMock()
+        self.loader.instance.reload_skill = True
+        self.loader.active = False
+        self.loader.loaded = False
+        self.assertFalse(self.loader.reload_needed())
+
     def test_skill_reload(self):
         """Test reloading a skill that was modified."""
         self.loader.instance = MagicMock()