openstack/swift
Code Issues Proposed changes

Merge "Increase connection timeout for object controller tests"

Browse Source
This commit is contained in:
Zuul 2017-11-06 19:06:24 +00:00 committed by Gerrit Code Review
commit 13116fefd8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/proxy/controllers/test_obj.py
View File

@ -169,8 +169,10 @@ class BaseObjectControllerMixin(object):
self.logger = debug_logger('proxy-server')
self.logger.thread_locals = ('txn1', '127.0.0.2')
# increase connection timeout to avoid intermittent failures
conf = {'conn_timeout': 1.0}
self.app = PatchedObjControllerApp(
None, FakeMemcache(), account_ring=FakeRing(),
conf, FakeMemcache(), account_ring=FakeRing(),
container_ring=FakeRing(), logger=self.logger)
# you can over-ride the container_info just by setting it on the app