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

Merge #824 Remove unused yaml argument in utils.submit_module_build

Browse Source
This commit is contained in:
Matt Prahl
2017-12-13 18:42:46 +00:00
parent a5d2dc3d66 c1dbe9be27
commit 564e1a8773
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_build_service/utils.py
View File

@@ -936,8 +936,8 @@ def record_component_builds(mmd, module, initial_batch=1,
def submit_module_build_from_yaml(username, handle, stream=None, skiptests=False,
optional_params=None):
yaml = handle.read()
mmd = load_mmd(yaml)
yaml_file = handle.read()
mmd = load_mmd(yaml_file)
# Mimic the way how default values are generated for modules that are stored in SCM
# We can take filename as the module name as opposed to repo name,
@@ -952,7 +952,7 @@ def submit_module_build_from_yaml(username, handle, stream=None, skiptests=False
if skiptests:
mmd.buildopts.rpms.macros += "\n\n%__spec_check_pre exit 0\n"
return submit_module_build(username, None, mmd, None, yaml, optional_params)
return submit_module_build(username, None, mmd, None, optional_params)
_url_check_re = re.compile(r"^[^:/]+:.*$")
@@ -968,10 +968,10 @@ def submit_module_build_from_scm(username, url, branch, allow_local_url=False,
url = "file://" + url
mmd, scm = _fetch_mmd(url, branch, allow_local_url)
return submit_module_build(username, url, mmd, scm, yaml, optional_params)
return submit_module_build(username, url, mmd, scm, optional_params)
def submit_module_build(username, url, mmd, scm, yaml, optional_params=None):
def submit_module_build(username, url, mmd, scm, optional_params=None):
import koji # Placed here to avoid py2/py3 conflicts...
# Import it here, because SCM uses utils methods

2
tests/test_utils/test_utils.py
View File

@@ -698,10 +698,8 @@ class TestUtils(unittest.TestCase):
mock_submit_args = mock_submit.call_args[0]
username_arg = mock_submit_args[0]
mmd_arg = mock_submit_args[2]
modulemd_yaml_arg = mock_submit_args[4]
assert mmd_arg.stream == stream
assert "\n\n%__spec_check_pre exit 0\n" in mmd_arg.buildopts.rpms.macros
assert modulemd_yaml_arg == modulemd_yaml
assert username_arg == username
rmtree(module_dir)