modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-23 10:12:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reuse function load_mmd

Browse Source 
GenericResolver.extract_modulemd is not removed, but deprecated. Call of it
will result in a deprecation message printed. Any new code should call
load_mmd.

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
This commit is contained in:
Chenxiong Qi
2019-04-24 08:37:31 +08:00
parent 808b7beec8
commit 1146bb3043
16 changed files with 117 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_resolver/test_db.py
View File

@@ -29,7 +29,7 @@ from module_build_service.utils import to_text_type
import module_build_service.resolver as mbs_resolver
from module_build_service import app, db, models, glib, utils, Modulemd
from module_build_service.utils import import_mmd, load_mmd
from module_build_service.utils import import_mmd, load_mmd_file
from module_build_service.models import ModuleBuild
import tests
@@ -43,7 +43,7 @@ class TestDBModule:
tests.reuse_component_init_data()
def test_get_buildrequired_modulemds(self):
mmd = load_mmd(os.path.join(base_dir, 'staged_data', 'platform.yaml'), True)
mmd = load_mmd_file(os.path.join(base_dir, 'staged_data', 'platform.yaml'))
mmd.set_stream('f30.1.3')
import_mmd(db.session, mmd)
platform_f300103 = ModuleBuild.query.filter_by(stream='f30.1.3').one()

4
tests/test_resolver/test_local.py
View File

@@ -26,7 +26,7 @@ from datetime import datetime
from module_build_service.utils import to_text_type
import module_build_service.resolver as mbs_resolver
from module_build_service import db
from module_build_service.utils import import_mmd, load_mmd
from module_build_service.utils import import_mmd, load_mmd_file
from module_build_service.models import ModuleBuild
import tests
@@ -40,7 +40,7 @@ class TestLocalResolverModule:
tests.reuse_component_init_data()
def test_get_buildrequired_modulemds(self):
mmd = load_mmd(os.path.join(base_dir, 'staged_data', 'platform.yaml'), True)
mmd = load_mmd_file(os.path.join(base_dir, 'staged_data', 'platform.yaml'))
mmd.set_stream('f8')
import_mmd(db.session, mmd)
platform_f8 = ModuleBuild.query.filter_by(stream='f8').one()

46
tests/test_resolver/test_mbs.py
View File

@@ -25,7 +25,7 @@ from mock import patch, PropertyMock, Mock, call
import module_build_service.resolver as mbs_resolver
import module_build_service.utils
import module_build_service.models
from module_build_service import glib, Modulemd, app
from module_build_service import glib, app
import tests
@@ -205,7 +205,7 @@ class TestMBSModule:
def test_get_module_build_dependencies_empty_buildrequires(self, mock_session,
testmodule_mmd_9c690d0e):
mmd = Modulemd.Module().new_from_string(testmodule_mmd_9c690d0e)
mmd = module_build_service.utils.load_mmd(testmodule_mmd_9c690d0e)
# Wipe out the dependencies
mmd.set_dependencies()
xmd = glib.from_variant_dict(mmd.get_xmd())
@@ -324,3 +324,45 @@ class TestMBSModule:
set(['bar'])
}
assert result == expected
def test_get_empty_buildrequired_modulemds(self):
resolver = mbs_resolver.GenericResolver.create(tests.conf, backend='mbs')
with patch.object(resolver, 'session') as session:
session.get.return_value = Mock(ok=True)
session.get.return_value.json.return_value = {
'items': [], 'meta': {'next': None}
}
result = resolver.get_buildrequired_modulemds(
'nodejs', '10', 'platform:el8:1:00000000')
assert [] == result
def test_get_buildrequired_modulemds(self):
resolver = mbs_resolver.GenericResolver.create(tests.conf, backend='mbs')
with patch.object(resolver, 'session') as session:
session.get.return_value = Mock(ok=True)
session.get.return_value.json.return_value = {
'items': [{
'name': 'nodejs', 'stream': '10',
'version': 1, 'context': 'c1',
'modulemd': tests.make_module(
'nodejs:10:1:c1', store_to_db=False).dumps(),
}, {
'name': 'nodejs', 'stream': '10',
'version': 2, 'context': 'c1',
'modulemd': tests.make_module(
'nodejs:10:2:c1', store_to_db=False).dumps(),
}], 'meta': {'next': None}
}
result = resolver.get_buildrequired_modulemds(
'nodejs', '10', 'platform:el8:1:00000000')
assert 1 == len(result)
mmd = result[0]
assert 'nodejs' == mmd.get_name()
assert '10' == mmd.get_stream()
assert 1 == mmd.get_version()
assert 'c1' == mmd.get_context()