mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-05-16 13:56:11 +08:00
Merge #857 Don't fail a module build when there are no buildrequires
This commit is contained in:
@@ -405,8 +405,8 @@ class PDCResolver(GenericResolver):
|
|||||||
else:
|
else:
|
||||||
queried_mmd = module_info
|
queried_mmd = module_info
|
||||||
|
|
||||||
if (not queried_mmd or not queried_mmd.xmd.get('mbs') or
|
if (not queried_mmd or 'mbs' not in queried_mmd.xmd or
|
||||||
not queried_mmd.xmd['mbs'].get('buildrequires')):
|
'buildrequires' not in queried_mmd.xmd['mbs']):
|
||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
'The module "{0!r}" did not contain its modulemd or did not have '
|
'The module "{0!r}" did not contain its modulemd or did not have '
|
||||||
'its xmd attribute filled out in PDC'.format(module_info))
|
'its xmd attribute filled out in PDC'.format(module_info))
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import os
|
|||||||
import copy
|
import copy
|
||||||
|
|
||||||
from mock import patch, PropertyMock
|
from mock import patch, PropertyMock
|
||||||
|
import pytest
|
||||||
|
|
||||||
import module_build_service.resolver as mbs_resolver
|
import module_build_service.resolver as mbs_resolver
|
||||||
import module_build_service.utils
|
import module_build_service.utils
|
||||||
@@ -66,10 +67,23 @@ class TestPDCModule:
|
|||||||
assert result['variant_version'] == 'master'
|
assert result['variant_version'] == 'master'
|
||||||
assert 'build_deps' in result
|
assert 'build_deps' in result
|
||||||
|
|
||||||
def test_get_module_build_dependencies(self, pdc_module_active):
|
@pytest.mark.parametrize('empty_buildrequires', [False, True])
|
||||||
|
def test_get_module_build_dependencies(self, pdc_module_active, empty_buildrequires):
|
||||||
"""
|
"""
|
||||||
Tests that we return just direct build-time dependencies of testmodule.
|
Tests that we return just direct build-time dependencies of testmodule.
|
||||||
"""
|
"""
|
||||||
|
expected = set(['module-f28-build'])
|
||||||
|
if empty_buildrequires:
|
||||||
|
expected = set()
|
||||||
|
pdc_item = pdc_module_active.endpoints['unreleasedvariants']['GET'][-1]
|
||||||
|
mmd = modulemd.ModuleMetadata()
|
||||||
|
mmd.loads(pdc_item['modulemd'])
|
||||||
|
mmd.buildrequires = {}
|
||||||
|
mmd.xmd['mbs']['buildrequires'] = {}
|
||||||
|
pdc_item.update({
|
||||||
|
'modulemd': mmd.dumps(),
|
||||||
|
'build_deps': []
|
||||||
|
})
|
||||||
query = {
|
query = {
|
||||||
'name': 'testmodule',
|
'name': 'testmodule',
|
||||||
'version': 'master',
|
'version': 'master',
|
||||||
@@ -77,7 +91,7 @@ class TestPDCModule:
|
|||||||
}
|
}
|
||||||
resolver = mbs_resolver.GenericResolver.create(tests.conf, backend='pdc')
|
resolver = mbs_resolver.GenericResolver.create(tests.conf, backend='pdc')
|
||||||
result = resolver.get_module_build_dependencies(query).keys()
|
result = resolver.get_module_build_dependencies(query).keys()
|
||||||
assert set(result) == set(['module-f28-build'])
|
assert set(result) == expected
|
||||||
|
|
||||||
def test_get_module_build_dependencies_recursive(self, pdc_module_active):
|
def test_get_module_build_dependencies_recursive(self, pdc_module_active):
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user