modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-24 10:43:16 +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

8
tests/test_builder/test_mock.py
View File

@@ -10,8 +10,8 @@ import kobo.rpmlib
from module_build_service import conf
from module_build_service.models import ModuleBuild, ComponentBuild, make_session
from module_build_service.builder.MockModuleBuilder import MockModuleBuilder
from module_build_service.utils import import_fake_base_module, load_mmd_file, mmd_to_str
from tests import clean_database, make_module
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
class TestMockModuleBuilder:
@@ -24,9 +24,7 @@ class TestMockModuleBuilder:
shutil.rmtree(self.resultdir)
def _create_module_with_filters(self, session, batch, state):
base_dir = os.path.abspath(os.path.dirname(__file__))
mmd = load_mmd_file(
os.path.join(base_dir, "..", "staged_data", "testmodule-with-filters.yaml"))
mmd = load_mmd(read_staged_data("testmodule-with-filters"))
# Set the name and stream
mmd = mmd.copy("mbs-testmodule", "test")
mmd.set_xmd({