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

Revert "added git option which will return correct return code"

Browse Source 
This caused an issue when the modulemd had the ref's for its components
as commit hashes instead of branches.

This reverts commit 15f332e60f.
This commit is contained in:
mprahl
2017-11-03 16:18:40 -04:00
parent c49a0192f0
commit e91f4fdea6
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_build_service/scm.py
View File

@@ -134,7 +134,7 @@ class SCM(object):
if stderr:
log.warning(stderr)
if proc.returncode != 0:
raise UnprocessableEntity("Failed on %r, retcode %r, out %r, err %r" % (
raise RuntimeError("Failed on %r, retcode %r, out %r, err %r" % (
cmd, proc.returncode, stdout, stderr))
return proc.returncode, stdout, stderr
@@ -186,7 +186,7 @@ class SCM(object):
"""
if self.scheme == "git":
log.debug("Getting/verifying commit hash for %s" % self.repository)
output = SCM._run(["git", "ls-remote", "--exit-code", self.repository, branch])[1]
output = SCM._run(["git", "ls-remote", self.repository, branch])[1]
if output:
self.commit = output.split("\t")[0]
return self.commit

11
tests/test_scm.py
View File

@@ -65,10 +65,8 @@ class TestSCMModule(unittest.TestCase):
scm = module_build_service.scm.SCM(repo_path)
assert scm.scheme == 'git', scm.scheme
fname = tempfile.mktemp(suffix='mbs-scm-test')
try:
scm.get_latest(branch='master; touch %s' % fname)
except UnprocessableEntity:
assert not os.path.exists(fname), "%r exists! Vulnerable." % fname
scm.get_latest(branch='master; touch %s' % fname)
assert not os.path.exists(fname), "%r exists! Vulnerable." % fname
def test_local_extract_name(self):
scm = module_build_service.scm.SCM(repo_path)
@@ -117,8 +115,3 @@ class TestSCMModule(unittest.TestCase):
scm.checkout(self.tempdir)
scm.verify()
scm.get_module_yaml()
@raises(UnprocessableEntity)
def test_get_latest_incorect_component_branch(self):
scm = module_build_service.scm.SCM(repo_path)
scm.get_latest(branch='foobar')