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

Don't allow a user to resubmit a module build that is already in the init state

Browse Source
This commit is contained in:
mprahl
2017-10-31 16:23:25 -04:00
parent c193ff7419
commit 6cf24baebb
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module_build_service/utils.py
View File

@@ -963,11 +963,9 @@ def submit_module_build(username, url, mmd, scm, yaml, optional_params=None):
log.debug('Checking whether module build already exist.')
# TODO: make this configurable, we might want to allow
# resubmitting any stuck build on DEV no matter the state
if module.state not in (models.BUILD_STATES['failed'],
models.BUILD_STATES['init']):
err_msg = ('Module (state=%s) already exists. '
'Only new build or resubmission of build in "init" or '
'"failed" state is allowed.' % module.state)
if module.state != models.BUILD_STATES['failed']:
err_msg = ('Module (state=%s) already exists. Only a new build or resubmission of '
'a failed build is allowed.' % module.state)
log.error(err_msg)
raise Conflict(err_msg)
log.debug('Resuming existing module build %r' % module)

26
tests/test_build/test_build.py
View File

@@ -840,6 +840,32 @@ class TestBuild(unittest.TestCase):
self.assertTrue(build.module_build.state in [models.BUILD_STATES["done"],
models.BUILD_STATES["ready"]])
@patch('module_build_service.auth.get_user', return_value=user)
@patch('module_build_service.scm.SCM')
def test_submit_build_resume_init_fail(self, mocked_scm, mocked_get_user, conf_system, dbg):
"""
Tests that resuming the build fails when the build is in init state
"""
FakeSCM(mocked_scm, 'testmodule', 'testmodule.yaml',
'620ec77321b2ea7b0d67d82992dda3e1d67055b4')
# Post so a module is in the init phase
rv = self.client.post('/module-build-service/1/module-builds/', data=json.dumps(
{'branch': 'master', 'scmurl': 'git://pkgs.stg.fedoraproject.org/modules/'
'testmodule.git?#68932c90de214d9d13feefbd35246a81b6cb8d49'}))
self.assertEqual(rv.status_code, 201)
# Post again and make sure it fails
rv2 = self.client.post('/module-build-service/1/module-builds/', data=json.dumps(
{'branch': 'master', 'scmurl': 'git://pkgs.stg.fedoraproject.org/modules/'
'testmodule.git?#68932c90de214d9d13feefbd35246a81b6cb8d49'}))
data = json.loads(rv2.data)
expected = {
'error': 'Conflict',
'message': ('Module (state=0) already exists. Only a new build or resubmission of a '
'failed build is allowed.'),
'status': 409
}
self.assertEqual(data, expected)
@patch("module_build_service.config.Config.system",
new_callable=PropertyMock, return_value="test")