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

Merge #728 FIx for issue 673

Browse Source
This commit is contained in:
Matt Prahl
2017-10-04 14:41:28 +00:00
parent 79a0420328 15f332e60f
commit e44f93178d
2 changed files with 11 additions and 4 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 RuntimeError("Failed on %r, retcode %r, out %r, err %r" % (
raise UnprocessableEntity("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", self.repository, branch])[1]
output = SCM._run(["git", "ls-remote", "--exit-code", self.repository, branch])[1]
if output:
self.commit = output.split("\t")[0]
return self.commit

11
tests/test_scm.py
View File

@@ -65,8 +65,10 @@ 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')
scm.get_latest(branch='master; touch %s' % fname)
assert not os.path.exists(fname), "%r exists! Vulnerable." % fname
try:
scm.get_latest(branch='master; touch %s' % fname)
except UnprocessableEntity:
assert not os.path.exists(fname), "%r exists! Vulnerable." % fname
def test_local_extract_name(self):
scm = module_build_service.scm.SCM(repo_path)
@@ -115,3 +117,8 @@ 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')