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

Merge #1356 Refactor make_module for tests

Browse Source
This commit is contained in:
Jan Kaluža
2019-07-23 10:50:19 +00:00
parent ab8abef058 5017fbae7f
commit 26c816f04c
13 changed files with 359 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_builder/test_koji.py
View File

@@ -39,7 +39,7 @@ from module_build_service.utils.general import mmd_to_str
import pytest
from mock import patch, MagicMock
from tests import conf, init_data, clean_database, make_module
from tests import conf, init_data, clean_database, make_module_in_db
from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
@@ -979,10 +979,10 @@ class TestGetDistTagSRPM:
@patch("tempfile.mkdtemp")
@patch("module_build_service.builder.KojiModuleBuilder.execute_cmd")
def _build_srpm(self, db_session, execute_cmd, mkdtemp):
module_build = make_module(
db_session,
module_build = make_module_in_db(
"{name}:{stream}:{version}:{context}".format(**self.module_nsvc),
xmd=self.xmd)
xmd=self.xmd,
db_session=db_session)
mkdtemp.return_value = self.tmp_srpm_build_dir
return KojiModuleBuilder.get_disttag_srpm("disttag", module_build)

12
tests/test_builder/test_mock.py
View File

@@ -11,7 +11,7 @@ from module_build_service import conf
from module_build_service.models import ModuleBuild, ComponentBuild
from module_build_service.builder.MockModuleBuilder import MockModuleBuilder
from module_build_service.utils import import_fake_base_module, mmd_to_str, load_mmd
from tests import clean_database, make_module, read_staged_data
from tests import clean_database, make_module_in_db, read_staged_data
class TestMockModuleBuilder:
@@ -202,10 +202,12 @@ class TestMockModuleBuilderAddRepos:
import_fake_base_module(db_session, "platform:f29:1:000000")
platform = ModuleBuild.get_last_build_in_stream(db_session, "platform", "f29")
foo = make_module(
db_session, "foo:1:1:1", {"platform": ["f29"]}, {"platform": ["f29"]})
app = make_module(
db_session, "app:1:1:1", {"platform": ["f29"]}, {"platform": ["f29"]})
module_deps = [{
"requires": {"platform": ["f29"]},
"buildrequires": {"platform": ["f29"]},
}]
foo = make_module_in_db("foo:1:1:1", module_deps, db_session=db_session)
app = make_module_in_db("app:1:1:1", module_deps, db_session=db_session)
patched_open.side_effect = [
mock.mock_open(read_data="[fake]\nrepofile 1\n").return_value,