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 #2312 from MycroftAI/bug/settingsmeta-upload-device-uuid 

settingsMeta API call to be issued without a device ID in the URL.
pull/2316/head
Åke 2019-09-18 10:01:40 +02:00 committed by GitHub
parent f4865286ab 9423f920c4
commit 35bf4c88b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mycroft/skills/settings.py
View File

@ -156,7 +156,7 @@ class SettingsMetaUploader:
self.yaml_path = self.skill_directory.joinpath('settingsmeta.yaml')
self.config = Configuration.get()
self.settings_meta = {}
self.api = DeviceApi()
self.api = None
self.upload_timer = None
# Property placeholders
@ -228,16 +228,20 @@ class SettingsMetaUploader:
"""
synced = False
if is_paired():
settings_meta_file_exists = (
self.json_path.is_file() or
self.yaml_path.is_file()
)
if settings_meta_file_exists:
self._load_settings_meta_file()
self.api = DeviceApi()
if self.api.identity.uuid:
settings_meta_file_exists = (
self.json_path.is_file() or
self.yaml_path.is_file()
)
if settings_meta_file_exists:
self._load_settings_meta_file()
self._update_settings_meta()
LOG.debug('Uploading settings meta for ' + self.skill_gid)
synced = self._issue_api_call()
self._update_settings_meta()
LOG.debug('Uploading settings meta for ' + self.skill_gid)
synced = self._issue_api_call()
else:
LOG.debug('settingsmeta.json not uploaded - no identity')
else:
LOG.debug('settingsmeta.json not uploaded - device is not paired')

29
test/unittests/skills/test_settings.py
View File

@ -68,24 +68,38 @@ class TestSettingsMetaUploader(MycroftUnitTestBase):
self._check_api_not_called()
self._check_timer_called()
def test_no_settingsmeta(self):
@patch('mycroft.skills.settings.DeviceApi')
def test_no_settingsmeta(self, mock_api):
api_instance = Mock()
api_instance.identity.uuid = '42'
mock_api.return_value = api_instance
self.uploader.upload()
self._check_settingsmeta()
self._check_api_call()
self._check_timer_not_called()
def test_failed_upload(self):
@patch('mycroft.skills.settings.DeviceApi')
def test_failed_upload(self, mock_api):
"""The API call to upload the settingsmeta fails.
This will cause a timer to be generated to retry the update.
"""
self.uploader.api.upload_skill_metadata = Mock(side_effect=ValueError)
api_instance = Mock()
api_instance.identity.uuid = '42'
api_instance.upload_skill_metadata = Mock(side_effect=ValueError)
mock_api.return_value = api_instance
self.uploader.upload()
self._check_settingsmeta()
self._check_api_call()
self._check_timer_called()
def test_json_settingsmeta(self):
@patch('mycroft.skills.settings.DeviceApi')
def test_json_settingsmeta(self, mock_api):
api_instance = Mock()
api_instance.identity.uuid = '42'
mock_api.return_value = api_instance
json_path = str(self.temp_dir.joinpath('settingsmeta.json'))
with open(json_path, 'w') as json_file:
json.dump(self.skill_metadata, json_file)
@ -95,7 +109,12 @@ class TestSettingsMetaUploader(MycroftUnitTestBase):
self._check_api_call()
self._check_timer_not_called()
def test_yaml_settingsmeta(self):
@patch('mycroft.skills.settings.DeviceApi')
def test_yaml_settingsmeta(self, mock_api):
api_instance = Mock()
api_instance.identity.uuid = '42'
mock_api.return_value = api_instance
skill_metadata = (
'skillMetadata:\n sections:\n - name: "Test Section"\n '
'fields:\n - type: "label"\n label: "Test Field"'