From 9d0067a0f546ce8a0fddb257655f2944c05e35e6 Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Fri, 4 Apr 2014 15:26:32 -0400 Subject: [PATCH] Attempt to ensure connect always timesout It seems that the test_connect_put_timeout() test does not always fail when it is expected. Sometimes, not very often, the attempt to connect succeeds, resulting in a failed test. This might be because the fake-connection infrastructure uses a sleep(0.1) and the test uses a connect timeout of 0.1. There might be a case where the two values result in the exact time where the entries happen to be added in the wrong order such that the sleep() completes first before the connect timeout fires, where the connect completes successfully. Closes bug 1302781 Change-Id: Ie23e40cf294170eccdf0713e313f9a31a92f9071 --- test/unit/proxy/controllers/test_obj.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/proxy/controllers/test_obj.py b/test/unit/proxy/controllers/test_obj.py index 4942691722..c31481e764 100755 --- a/test/unit/proxy/controllers/test_obj.py +++ b/test/unit/proxy/controllers/test_obj.py @@ -82,7 +82,7 @@ class TestObjControllerWriteAffinity(unittest.TestCase): def test_connect_put_node_timeout(self): controller = proxy_server.ObjectController(self.app, 'a', 'c', 'o') - self.app.conn_timeout = 0.1 + self.app.conn_timeout = 0.05 with set_http_connect(200, slow_connect=True): nodes = [dict(ip='', port='', device='')] res = controller._connect_put_node(nodes, '', '', {}, ('', ''))