MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Fix reload_allowed check
pull/2268/head^2
Åke 2019-08-22 21:13:35 +02:00 committed by GitHub
parent e6dc2d145e 8996972e78
commit 125ed57ac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mycroft/skills/skill_loader.py
View File

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

10
test/unittests/skills/test_skill_loader.py
View File

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