RHELBLD-265: Refactor reuse_component_init_data

Replace db_session.commit() calls with flush in reuse_component_init_data as well as init_data functions.

tests/conftest.py

@@ -4,12 +4,10 @@ from __future__ import absolute_import
 from datetime import datetime
 import os
 
-import koji
 import mock
 import pytest
 
 import module_build_service
-from module_build_service.builder.utils import get_rpm_release
 from module_build_service.common.models import BUILD_STATES
 from module_build_service.common.utils import load_mmd, mmd_to_str, import_mmd
 from module_build_service.scheduler.db_session import db_session
@@ -18,6 +16,7 @@ from tests import (
     init_data,
     truncate_tables,
     read_staged_data,
+    reuse_component_init_data as reuse_component_init_data_impl,
 )
 
 BASE_DIR = os.path.dirname(__file__)
@@ -128,198 +127,14 @@ def provide_test_data_cls(request, require_platform_and_default_arch_cls):
     provide_test_data_impl(request)
 
 
-def reuse_component_init_impl():
-    mmd = load_mmd(read_staged_data("formatted_testmodule"))
-
-    build_one = module_build_service.common.models.ModuleBuild(
-        name="testmodule",
-        stream="master",
-        version='20170109091357',
-        state=BUILD_STATES["ready"],
-        runtime_context="ac4de1c346dcf09ce77d38cd4e75094ec1c08eb0",
-        build_context="ac4de1c346dcf09ce77d38cd4e75094ec1c08eb1",
-        context="78e4a6fd",
-        koji_tag="module-testmodule-master-20170109091357-78e4a6fd",
-        scmurl="https://src.stg.fedoraproject.org/modules/testmodule.git?#ff1ea79",
-        batch=3,
-        owner="Tom Brady",
-        time_submitted=datetime(2017, 2, 15, 16, 8, 18),
-        time_modified=datetime(2017, 2, 15, 16, 19, 35),
-        time_completed=datetime(2017, 2, 15, 16, 19, 35),
-        rebuild_strategy="changed-and-after",
-    )
-
-    build_one_component_release = get_rpm_release(db_session, build_one)
-
-    mmd.set_version(int(build_one.version))
-    xmd = mmd.get_xmd()
-    xmd["mbs"]["scmurl"] = build_one.scmurl
-    xmd["mbs"]["commit"] = "ff1ea79fc952143efeed1851aa0aa006559239ba"
-    mmd.set_xmd(xmd)
-    build_one.modulemd = mmd_to_str(mmd)
-    contexts = module_build_service.common.models.ModuleBuild.contexts_from_mmd(build_one.modulemd)
-    build_one.build_context = contexts.build_context
-    build_one.build_context_no_bms = contexts.build_context_no_bms
-
-    db_session.add(build_one)
-    db_session.commit()
-    db_session.refresh(build_one)
-
-    platform_br = module_build_service.common.models.ModuleBuild.get_by_id(db_session, 1)
-    build_one.buildrequires.append(platform_br)
-
-    arch = db_session.query(module_build_service.common.models.ModuleArch).get(1)
-    build_one.arches.append(arch)
-
-    db_session.add_all([
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_one.id,
-            package="perl-Tangerine",
-            scmurl="https://src.fedoraproject.org/rpms/perl-Tangerine"
-                   "?#4ceea43add2366d8b8c5a622a2fb563b625b9abf",
-            format="rpms",
-            task_id=90276227,
-            state=koji.BUILD_STATES["COMPLETE"],
-            nvr="perl-Tangerine-0.23-1.{0}".format(build_one_component_release),
-            batch=2,
-            ref="4ceea43add2366d8b8c5a622a2fb563b625b9abf",
-            tagged=True,
-            tagged_in_final=True,
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_one.id,
-            package="perl-List-Compare",
-            scmurl="https://src.fedoraproject.org/rpms/perl-List-Compare"
-                   "?#76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb",
-            format="rpms",
-            task_id=90276228,
-            state=koji.BUILD_STATES["COMPLETE"],
-            nvr="perl-List-Compare-0.53-5.{0}".format(build_one_component_release),
-            batch=2,
-            ref="76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb",
-            tagged=True,
-            tagged_in_final=True,
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_one.id,
-            package="tangerine",
-            scmurl="https://src.fedoraproject.org/rpms/tangerine"
-                   "?#fbed359411a1baa08d4a88e0d12d426fbf8f602c",
-            format="rpms",
-            task_id=90276315,
-            state=koji.BUILD_STATES["COMPLETE"],
-            nvr="tangerine-0.22-3.{0}".format(build_one_component_release),
-            batch=3,
-            ref="fbed359411a1baa08d4a88e0d12d426fbf8f602c",
-            tagged=True,
-            tagged_in_final=True,
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_one.id,
-            package="module-build-macros",
-            scmurl="/tmp/module_build_service-build-macrosqr4AWH/SRPMS/module-build-"
-                   "macros-0.1-1.module_testmodule_master_20170109091357.src.rpm",
-            format="rpms",
-            task_id=90276181,
-            state=koji.BUILD_STATES["COMPLETE"],
-            nvr="module-build-macros-0.1-1.{0}".format(build_one_component_release),
-            batch=1,
-            tagged=True,
-            build_time_only=True,
-        ),
-    ])
-    # Commit component builds added to build_one
-    db_session.commit()
-
-    build_two = module_build_service.common.models.ModuleBuild(
-        name="testmodule",
-        stream="master",
-        version='20170219191323',
-        state=BUILD_STATES["build"],
-        runtime_context="ac4de1c346dcf09ce77d38cd4e75094ec1c08eb0",
-        build_context="ac4de1c346dcf09ce77d38cd4e75094ec1c08eb1",
-        context="c40c156c",
-        koji_tag="module-testmodule-master-20170219191323-c40c156c",
-        scmurl="https://src.stg.fedoraproject.org/modules/testmodule.git?#55f4a0a",
-        batch=1,
-        owner="Tom Brady",
-        time_submitted=datetime(2017, 2, 19, 16, 8, 18),
-        time_modified=datetime(2017, 2, 19, 16, 8, 18),
-        rebuild_strategy="changed-and-after",
-    )
-
-    build_two_component_release = get_rpm_release(db_session, build_two)
-
-    mmd.set_version(int(build_one.version))
-    xmd = mmd.get_xmd()
-    xmd["mbs"]["scmurl"] = build_one.scmurl
-    xmd["mbs"]["commit"] = "55f4a0a2e6cc255c88712a905157ab39315b8fd8"
-    mmd.set_xmd(xmd)
-    build_two.modulemd = mmd_to_str(mmd)
-    contexts = module_build_service.common.models.ModuleBuild.contexts_from_mmd(build_two.modulemd)
-    build_two.build_context = contexts.build_context
-    build_two.build_context_no_bms = contexts.build_context_no_bms
-
-    db_session.add(build_two)
-    db_session.commit()
-    db_session.refresh(build_two)
-
-    build_two.arches.append(arch)
-    build_two.buildrequires.append(platform_br)
-
-    db_session.add_all([
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_two.id,
-            package="perl-Tangerine",
-            scmurl="https://src.fedoraproject.org/rpms/perl-Tangerine"
-                   "?#4ceea43add2366d8b8c5a622a2fb563b625b9abf",
-            format="rpms",
-            batch=2,
-            ref="4ceea43add2366d8b8c5a622a2fb563b625b9abf",
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_two.id,
-            package="perl-List-Compare",
-            scmurl="https://src.fedoraproject.org/rpms/perl-List-Compare"
-                   "?#76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb",
-            format="rpms",
-            batch=2,
-            ref="76f9d8c8e87eed0aab91034b01d3d5ff6bd5b4cb",
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_two.id,
-            package="tangerine",
-            scmurl="https://src.fedoraproject.org/rpms/tangerine"
-                   "?#fbed359411a1baa08d4a88e0d12d426fbf8f602c",
-            format="rpms",
-            batch=3,
-            ref="fbed359411a1baa08d4a88e0d12d426fbf8f602c",
-        ),
-        module_build_service.common.models.ComponentBuild(
-            module_id=build_two.id,
-            package="module-build-macros",
-            scmurl="/tmp/module_build_service-build-macrosqr4AWH/SRPMS/module-build-"
-                   "macros-0.1-1.module_testmodule_master_20170219191323.src.rpm",
-            format="rpms",
-            task_id=90276186,
-            state=koji.BUILD_STATES["COMPLETE"],
-            nvr="module-build-macros-0.1-1.{0}".format(build_two_component_release),
-            batch=1,
-            tagged=True,
-            build_time_only=True,
-        ),
-    ])
-    db_session.commit()
-
-
 @pytest.fixture()
 def reuse_component_init_data(require_platform_and_default_arch):
-    reuse_component_init_impl()
+    reuse_component_init_data_impl()
 
 
 @pytest.fixture(scope="class")
 def reuse_component_init_data_cls(require_platform_and_default_arch_cls):
-    reuse_component_init_impl()
+    reuse_component_init_data_impl()
 
 
 @pytest.fixture()