From 9eff11fdb04a5e1b4a30adb5c616e7deea2c707a Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Tue, 6 Dec 2016 10:34:59 +0100
Subject: [PATCH] Use timeout for build tests to prevent hanging, import queue
 from six.moves, fix init_logging import for jenkins

---
 module_build_service/__init__.py  | 4 ++--
 module_build_service/messaging.py | 2 +-
 tests/test_build/test_build.py    | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module_build_service/__init__.py b/module_build_service/__init__.py
index f3737cd8..bb18ddba 100644
--- a/module_build_service/__init__.py
+++ b/module_build_service/__init__.py
@@ -45,7 +45,7 @@ for a number of tasks:
 from flask import Flask, has_app_context, url_for
 from flask_sqlalchemy import SQLAlchemy
 
-import module_build_service.logger
+from module_build_service.logger import init_logging
 
 from logging import getLogger
 from module_build_service.errors import (
@@ -115,7 +115,7 @@ def notfound_error(e):
     """Flask error handler for Conflict exceptions"""
     return json_error(404, 'Not Found', e.args[0])
 
-module_build_service.logger.init_logging(conf)
+init_logging(conf)
 log = getLogger(__name__)
 
 from module_build_service import views
diff --git a/module_build_service/messaging.py b/module_build_service/messaging.py
index b8fc6449..573f7317 100644
--- a/module_build_service/messaging.py
+++ b/module_build_service/messaging.py
@@ -33,7 +33,7 @@ except ImportError:
     from funcsigs import signature
 
 from module_build_service import log
-import queue
+import six.moves.queue as queue
 
 class BaseMessage(object):
     def __init__(self, msg_id):
diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py
index 734168f7..471c090e 100644
--- a/tests/test_build/test_build.py
+++ b/tests/test_build/test_build.py
@@ -28,6 +28,8 @@ import xmlrpclib
 from os import path, mkdir
 from shutil import copyfile
 
+from nose.tools import timed
+
 from module_build_service import db
 
 import module_build_service.messaging
@@ -197,6 +199,7 @@ class TestBuild(unittest.TestCase):
         conf.set_item("system", "koji")
         TestModuleBuilder.reset()
 
+    @timed(30)
     @patch('module_build_service.auth.get_username', return_value='Homer J. Simpson')
     @patch('module_build_service.auth.assert_is_packager')
     @patch('module_build_service.scm.SCM')
@@ -225,6 +228,7 @@ class TestBuild(unittest.TestCase):
             self.assertEqual(build.state, koji.BUILD_STATES['COMPLETE'])
             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.assert_is_packager')
     @patch('module_build_service.scm.SCM')