diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-09-26 03:31:51 +0000 |
|---|---|---|
| committer |   Jose Lausuch <jalausuch@suse.com> | 2017-10-03 06:28:47 +0000 |
| commit | 3ef5513ea2786a09ccc884b18d03dc1401f0d714 (patch) | |
| tree | 7d5e6ebaa6f11a494f767629a4f4417a9604c6f6 | |
| parent | b7f390c91994cbcebac60e55f32a543cd4d46c1c (diff) | |
Fix timeout for socket connection
Change-Id: I0688761ba7224f40f79310295efadd9b40bfeefb
Signed-off-by: Linda Wang <wangwulin@huawei.com>
(cherry picked from commit 112e652af2b2f61192d3f1bd903522a14be06b94)
| -rw-r--r-- | functest/ci/check_deployment.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py index 13bb4c8bc..e593e17b8 100644 --- a/functest/ci/check_deployment.py +++ b/functest/ci/check_deployment.py @@ -20,7 +20,6 @@ import logging.config import os import pkg_resources import socket -import time from urlparse import urlparse from snaps.openstack.utils import glance_utils @@ -34,20 +33,16 @@ __author__ = "Jose Lausuch <jose.lausuch@ericsson.com>" LOGGER = logging.getLogger(__name__) -def verify_connectivity(adress, port, timeout=10): +def verify_connectivity(adress, port): """ Returns true if an ip/port is reachable""" connection = socket.socket() - count = 0 - while count < timeout: - try: - connection.connect((adress, port)) - LOGGER.debug('%s:%s is reachable!', adress, port) - return True - except socket.error: - count += 1 - time.sleep(1) - continue - LOGGER.error('%s:%s is not reachable.', adress, port) + connection.settimeout(10) + try: + connection.connect((adress, port)) + LOGGER.debug('%s:%s is reachable!', adress, port) + return True + except socket.error: + LOGGER.error('%s:%s is not reachable.', adress, port) return False |