manifest: fix AttributeError in self import

This only passed CI because we had no coverage. Now we do.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2020-01-22 12:38:30 -08:00 committed by Marti Bolivar
parent 75a416a526
commit 5cd9d8cfd1
2 changed files with 16 additions and 1 deletions

View File

@ -635,7 +635,7 @@ class Manifest:
for subimp in imp: for subimp in imp:
self._import_from_self(mp, subimp, projects) self._import_from_self(mp, subimp, projects)
elif imptype == dict: elif imptype == dict:
self._import_map(mp, imp, self.import_path_from_self, projects) self._import_map(mp, imp, self._import_path_from_self, projects)
else: else:
self._malformed(f'{mp.abspath}: "self: import: {imp}" ' self._malformed(f'{mp.abspath}: "self: import: {imp}" '
f'has invalid type {imptype}') f'has invalid type {imptype}')

View File

@ -1676,6 +1676,21 @@ _IMPORT_SELF_MANIFESTS = [
- west.d/02-vendor-hals.yml - west.d/02-vendor-hals.yml
- west.d/03-applications.yml - west.d/03-applications.yml
''' '''
# as an equivalent map:
'''\
manifest:
remotes:
- name: upstream
url-base: upstream.com
projects:
- name: upstream
remote: upstream
revision: refs/tags/v1.0
import: true
self:
import:
file: west.d
'''
] ]
_IMPORT_SELF_SUBMANIFESTS = { _IMPORT_SELF_SUBMANIFESTS = {