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

Use the libmodulemd API properly when setting values on existing objects

Browse Source 
MBS has been using the libmodulemd API incorrectly by assuming that
methods like `get_rpm_components` return the actual object in memory
and not a copy. This has been true but wasn't something sgallagh
intended. We found this out after he had me test his new version of
libmodulemd. This PR removes those assumptions.
This commit is contained in:
mprahl
2018-07-16 18:38:37 -04:00
parent 1ec9849960
commit 8173040ea6
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_utils/test_utils.py
View File

@@ -90,8 +90,9 @@ class TestUtilsComponentReuse:
second_module_build = models.ModuleBuild.query.filter_by(id=3).one()
if changed_component:
mmd = second_module_build.mmd()
mmd.get_rpm_components()['tangerine'].set_ref(
'00ea1da4192a2030f9ae023de3b3143ed647bbab')
components = mmd.get_rpm_components()
components['tangerine'].set_ref('00ea1da4192a2030f9ae023de3b3143ed647bbab')
mmd.set_rpm_components(components)
second_module_build.modulemd = mmd.dumps()
second_module_changed_component = models.ComponentBuild.query.filter_by(
package=changed_component, module_id=3).one()
@@ -204,7 +205,9 @@ class TestUtilsComponentReuse:
mmd = second_module_build.mmd()
br_list = Modulemd.SimpleSet()
br_list.add('master')
mmd.get_dependencies()[0].set_buildrequires({'some_module': br_list})
deps = mmd.get_dependencies()
deps[0].set_buildrequires({'some_module': br_list})
mmd.set_dependencies(deps)
xmd = glib.from_variant_dict(mmd.get_xmd())
xmd['mbs']['buildrequires'] = {
'some_module': {
@@ -306,9 +309,11 @@ class TestUtils:
mmd = Modulemd.Module().new_from_file(
path.join(BASE_DIR, '..', 'staged_data', 'testmodule.yaml'))
mmd.upgrade()
components = mmd.get_rpm_components()
# Modify the component branches so we can identify them later on
mmd.get_rpm_components()['perl-Tangerine'].set_ref('f28')
mmd.get_rpm_components()['tangerine'].set_ref('f27')
components['perl-Tangerine'].set_ref('f28')
components['tangerine'].set_ref('f27')
mmd.set_rpm_components(components)
module_build_service.utils.format_mmd(mmd, scmurl)
# Make sure that original refs are not changed.