aboutsummaryrefslogtreecommitdiff
path: root/kolla/tests
diff options
context:
space:
mode:
authorVikram Hosakote <vhosakot@cisco.com>2016-02-23 21:04:04 +0000
committerVikram Hosakote <vhosakot@cisco.com>2016-02-28 00:54:47 +0000
commit320c1f92724d6c7bce45398dd783c4334969d23d (patch)
tree36285aba495642f437eadc936cff1f38f2e02041 /kolla/tests
parentc81097df8b0525bcff9df875f38bbfe2ab83be3f (diff)
downloadkolla-320c1f92724d6c7bce45398dd783c4334969d23d.tar.gz
kolla-320c1f92724d6c7bce45398dd783c4334969d23d.zip
Add timeout to requests.get() in kolla/cmd/build.py
When kolla-build is running, if there are network issues or if the source's location (like http://tarballs.openstack.org) fails to respond due to high number of concurrent requests, kolla-build just hangs/blocks indefinitely. This patch set resolves this issue by adding a timeout of 120 seconds for requests.get() in kolla/cmd/build.py, adds a unit test for it in kolla/tests/test_build.py and also the "timeout" argument in kolla/common/config.py. Change-Id: I7c8745a20b9bd1c3f5d6a55c72a794f16fd7e513 Closes-Bug: #1548614
Diffstat (limited to 'kolla/tests')
-rw-r--r--kolla/tests/test_build.py22
1 files changed, 22 insertions, 0 deletions
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 76020ef2a..b6eeffa7d 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -14,6 +14,7 @@ import fixtures
import itertools
import mock
import os
+import requests
from kolla.cmd import build
from kolla.tests import base
@@ -106,6 +107,27 @@ class WorkerThreadTest(base.TestCase):
nocache=False, rm=True, pull=True, forcerm=True,
buildargs=build_args)
+ @mock.patch('docker.Client')
+ @mock.patch('requests.get')
+ def test_requests_get_timeout(self, mock_get, mock_client):
+ worker = build.WorkerThread(mock.Mock(),
+ mock.Mock(),
+ self.conf)
+ self.image['source'] = {
+ 'source': 'http://fake/source',
+ 'type': 'url',
+ 'name': 'fake-image-base'
+ }
+ mock_get.side_effect = requests.exceptions.Timeout
+ get_result = worker.process_source(self.image,
+ self.image['source'])
+
+ self.assertIsNone(get_result)
+ self.assertEqual(self.image['status'], 'error')
+ self.assertEqual(self.image['logs'], str())
+ mock_get.assert_called_once_with(self.image['source']['source'],
+ timeout=120)
+
class KollaWorkerTest(base.TestCase):