modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-05-11 10:34:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reuse function read_staged_data

Browse Source 
In addition, reuse staged_data_filename to construct file and directory name.

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
This commit is contained in:
Chenxiong Qi
2019-06-29 17:08:52 +08:00
parent a80f15a6d3
commit c15a7cadf3
13 changed files with 104 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_resolver/test_db.py
View File

@@ -28,7 +28,7 @@ import pytest
import module_build_service.resolver as mbs_resolver
from module_build_service import app, conf, db, models, utils, Modulemd
from module_build_service.utils import import_mmd, load_mmd_file, mmd_to_str
from module_build_service.utils import import_mmd, mmd_to_str, load_mmd
from module_build_service.models import ModuleBuild
import tests
@@ -41,7 +41,7 @@ class TestDBModule:
tests.reuse_component_init_data()
def test_get_buildrequired_modulemds(self):
mmd = load_mmd_file(os.path.join(base_dir, "staged_data", "platform.yaml"))
mmd = load_mmd(tests.read_staged_data("platform"))
mmd = mmd.copy(mmd.get_module_name(), "f30.1.3")
with models.make_session(conf) as db_session:
import_mmd(db_session, mmd)
@@ -153,7 +153,7 @@ class TestDBModule:
@patch(
"module_build_service.config.Config.mock_resultsdir",
new_callable=PropertyMock,
return_value=os.path.join(base_dir, "staged_data", "local_builds"),
return_value=tests.staged_data_filename("local_builds"),
)
def test_get_module_build_dependencies_recursive_requires(self, resultdir, conf_system):
"""
@@ -166,7 +166,7 @@ class TestDBModule:
resolver = mbs_resolver.GenericResolver.create(tests.conf, backend="db")
result = resolver.get_module_build_dependencies(mmd=build[0].mmd()).keys()
local_path = os.path.join(base_dir, "staged_data", "local_builds")
local_path = tests.staged_data_filename("local_builds")
expected = [os.path.join(local_path, "module-parent-master-20170816080815/results")]
assert set(result) == set(expected)
@@ -240,7 +240,7 @@ class TestDBModule:
@patch(
"module_build_service.config.Config.mock_resultsdir",
new_callable=PropertyMock,
return_value=os.path.join(base_dir, "staged_data", "local_builds"),
return_value=tests.staged_data_filename("local_builds")
)
def test_resolve_profiles_local_module(self, local_builds, conf_system):
"""

4
tests/test_resolver/test_local.py
View File

@@ -25,7 +25,7 @@ from datetime import datetime
import module_build_service.resolver as mbs_resolver
from module_build_service import db
from module_build_service.utils.general import import_mmd, load_mmd_file, mmd_to_str
from module_build_service.utils.general import import_mmd, mmd_to_str, load_mmd
from module_build_service.models import ModuleBuild
import tests
@@ -38,7 +38,7 @@ class TestLocalResolverModule:
tests.reuse_component_init_data()
def test_get_buildrequired_modulemds(self):
mmd = load_mmd_file(os.path.join(base_dir, "staged_data", "platform.yaml"))
mmd = load_mmd(tests.read_staged_data("platform"))
mmd = mmd.copy(mmd.get_module_name(), "f8")
import_mmd(db.session, mmd)
platform_f8 = ModuleBuild.query.filter_by(stream="f8").one()

2
tests/test_resolver/test_mbs.py
View File

@@ -348,7 +348,7 @@ class TestMBSModule:
@patch(
"module_build_service.config.Config.mock_resultsdir",
new_callable=PropertyMock,
return_value=os.path.join(base_dir, "staged_data", "local_builds"),
return_value=tests.staged_data_filename("local_builds")
)
def test_resolve_profiles_local_module(
self, local_builds, conf_system, formatted_testmodule_mmd