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

Merge #240 Use timeout for build tests to prevent hanging, import queue from six.moves, fix init_logging import for jenkins

Browse Source
This commit is contained in:
Jan Kaluža
2016-12-07 11:19:38 +00:00
parent 8c7e631cac 9eff11fdb0
commit f14fc00a09
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_build_service/__init__.py
View File

@@ -45,7 +45,7 @@ for a number of tasks:
from flask import Flask, has_app_context, url_for from flask import Flask, has_app_context, url_for
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
import module_build_service.logger from module_build_service.logger import init_logging
from logging import getLogger from logging import getLogger
from module_build_service.errors import ( from module_build_service.errors import (
@@ -115,7 +115,7 @@ def notfound_error(e):
"""Flask error handler for Conflict exceptions""" """Flask error handler for Conflict exceptions"""
return json_error(404, 'Not Found', e.args[0]) return json_error(404, 'Not Found', e.args[0])
module_build_service.logger.init_logging(conf) init_logging(conf)
log = getLogger(__name__) log = getLogger(__name__)
from module_build_service import views from module_build_service import views

2
module_build_service/messaging.py
View File

@@ -33,7 +33,7 @@ except ImportError:
from funcsigs import signature from funcsigs import signature
from module_build_service import log from module_build_service import log
import queue import six.moves.queue as queue
class BaseMessage(object): class BaseMessage(object):
def __init__(self, msg_id): def __init__(self, msg_id):

4
tests/test_build/test_build.py
View File

@@ -28,6 +28,8 @@ import xmlrpclib
from os import path, mkdir from os import path, mkdir
from shutil import copyfile from shutil import copyfile
from nose.tools import timed
from module_build_service import db from module_build_service import db
import module_build_service.messaging import module_build_service.messaging
@@ -197,6 +199,7 @@ class TestBuild(unittest.TestCase):
conf.set_item("system", "koji") conf.set_item("system", "koji")
TestModuleBuilder.reset() TestModuleBuilder.reset()
@timed(30)
@patch('module_build_service.auth.get_username', return_value='Homer J. Simpson') @patch('module_build_service.auth.get_username', return_value='Homer J. Simpson')
@patch('module_build_service.auth.assert_is_packager') @patch('module_build_service.auth.assert_is_packager')
@patch('module_build_service.scm.SCM') @patch('module_build_service.scm.SCM')
@@ -225,6 +228,7 @@ class TestBuild(unittest.TestCase):
self.assertEqual(build.state, koji.BUILD_STATES['COMPLETE']) self.assertEqual(build.state, koji.BUILD_STATES['COMPLETE'])
self.assertTrue(build.module_build.state in [models.BUILD_STATES["done"], models.BUILD_STATES["ready"]] ) self.assertTrue(build.module_build.state in [models.BUILD_STATES["done"], models.BUILD_STATES["ready"]] )
@timed(30)
@patch('module_build_service.auth.get_username', return_value='Homer J. Simpson') @patch('module_build_service.auth.get_username', return_value='Homer J. Simpson')
@patch('module_build_service.auth.assert_is_packager') @patch('module_build_service.auth.assert_is_packager')
@patch('module_build_service.scm.SCM') @patch('module_build_service.scm.SCM')