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

Reuse ComponentBuild.from_component_name in tests

Browse Source 
Signed-off-by: Chenxiong Qi <cqi@redhat.com>
This commit is contained in:
Chenxiong Qi
2019-07-14 16:01:46 +08:00
parent 5028746a2f
commit 26033bd8f7
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_scheduler/test_tag_tagged.py
View File

@@ -333,8 +333,8 @@ class TestTagTagged:
module_build = module_build_service.models.ModuleBuild.get_by_id(db_session, 3)
module_build.batch = 2
mbm = db_session.query(module_build_service.models.ComponentBuild).filter_by(
module_id=3, package="module-build-macros").one()
mbm = module_build_service.models.ComponentBuild.from_component_name(
db_session, "module-build-macros", 3)
mbm.tagged = False
for c in module_build.current_batch():

30
tests/test_utils/test_utils.py
View File

@@ -105,8 +105,9 @@ class TestUtilsComponentReuse:
mmd = second_module_build.mmd()
mmd.get_rpm_component("tangerine").set_ref("00ea1da4192a2030f9ae023de3b3143ed647bbab")
second_module_build.modulemd = mmd_to_str(mmd)
second_module_changed_component = db_session.query(models.ComponentBuild).filter_by(
package=changed_component, module_id=3).one()
second_module_changed_component = models.ComponentBuild.from_component_name(
db_session, changed_component, second_module_build.id)
second_module_changed_component.ref = "00ea1da4192a2030f9ae023de3b3143ed647bbab"
db_session.add(second_module_changed_component)
db_session.commit()
@@ -173,8 +174,8 @@ class TestUtilsComponentReuse:
db_session.commit()
if set_database_arch: # set architecture for build in database
second_module_changed_component = db_session.query(models.ComponentBuild).filter_by(
package="tangerine", module_id=2).one()
second_module_changed_component = models.ComponentBuild.from_component_name(
db_session, "tangerine", 2)
mmd = second_module_changed_component.module_build.mmd()
component = mmd.get_rpm_component("tangerine")
component.reset_arches()
@@ -1096,12 +1097,13 @@ class TestBatches:
"""
module_build = models.ModuleBuild.get_by_id(db_session, 3)
module_build.batch = 1
plc_component = db_session.query(models.ComponentBuild).filter_by(
module_id=3, package="perl-List-Compare").one()
plc_component = models.ComponentBuild.from_component_name(
db_session, "perl-List-Compare", 3)
plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"
builder = mock.MagicMock()
builder.recover_orphaned_artifact.return_value = []
further_work = module_build_service.utils.start_next_batch_build(
conf, module_build, db_session, builder)
@@ -1184,8 +1186,8 @@ class TestBatches:
module_build.rebuild_strategy = "only-changed"
module_build.batch = 1
# perl-List-Compare changed
plc_component = db_session.query(models.ComponentBuild).filter_by(
module_id=3, package="perl-List-Compare").one()
plc_component = models.ComponentBuild.from_component_name(
db_session, "perl-List-Compare", 3)
plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"
builder = mock.MagicMock()
@@ -1215,8 +1217,8 @@ class TestBatches:
# Complete the build
plc_component.state = koji.BUILD_STATES["COMPLETE"]
pt_component = db_session.query(models.ComponentBuild).filter_by(
module_id=3, package="perl-Tangerine").one()
pt_component = models.ComponentBuild.from_component_name(
db_session, "perl-Tangerine", 3)
pt_component.state = koji.BUILD_STATES["COMPLETE"]
# Start the next build batch
@@ -1242,11 +1244,11 @@ class TestBatches:
"""
module_build = models.ModuleBuild.get_by_id(db_session, 3)
module_build.batch = 1
pt_component = db_session.query(models.ComponentBuild).filter_by(
module_id=3, package="perl-Tangerine").one()
pt_component = models.ComponentBuild.from_component_name(
db_session, "perl-Tangerine", 3)
pt_component.ref = "6ceea46add2366d8b8c5a623b2fb563b625bfabe"
plc_component = db_session.query(models.ComponentBuild).filter_by(
module_id=3, package="perl-List-Compare").one()
plc_component = models.ComponentBuild.from_component_name(
db_session, "perl-List-Compare", 3)
plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"
# Components are by default built by component id. To find out that weight is respected,