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

Revert "Use the libmodulemd API properly when setting values on existing objects"

Browse Source 
This reverts commit 8173040ea6. Since it didn't
provide any real benefit after talking with sgallagh, it seems like we'd better
off not introduce more risk to the next deployment.
This commit is contained in:
mprahl
2018-08-07 12:03:44 -04:00
parent f08135352a
commit 5197eb4912
3 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_utils/test_utils.py
View File

@@ -90,9 +90,8 @@ class TestUtilsComponentReuse:
second_module_build = models.ModuleBuild.query.filter_by(id=3).one()
if changed_component:
mmd = second_module_build.mmd()
components = mmd.get_rpm_components()
components['tangerine'].set_ref('00ea1da4192a2030f9ae023de3b3143ed647bbab')
mmd.set_rpm_components(components)
mmd.get_rpm_components()['tangerine'].set_ref(
'00ea1da4192a2030f9ae023de3b3143ed647bbab')
second_module_build.modulemd = mmd.dumps()
second_module_changed_component = models.ComponentBuild.query.filter_by(
package=changed_component, module_id=3).one()
@@ -205,9 +204,7 @@ class TestUtilsComponentReuse:
mmd = second_module_build.mmd()
br_list = Modulemd.SimpleSet()
br_list.add('master')
deps = mmd.get_dependencies()
deps[0].set_buildrequires({'some_module': br_list})
mmd.set_dependencies(deps)
mmd.get_dependencies()[0].set_buildrequires({'some_module': br_list})
xmd = glib.from_variant_dict(mmd.get_xmd())
xmd['mbs']['buildrequires'] = {
'some_module': {
@@ -309,11 +306,9 @@ 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
components['perl-Tangerine'].set_ref('f28')
components['tangerine'].set_ref('f27')
mmd.set_rpm_components(components)
mmd.get_rpm_components()['perl-Tangerine'].set_ref('f28')
mmd.get_rpm_components()['tangerine'].set_ref('f27')
module_build_service.utils.format_mmd(mmd, scmurl)
# Make sure that original refs are not changed.