diff options
Diffstat (limited to 'functest')
-rw-r--r-- | functest/ci/check_deployment.py | 21 | ||||
-rw-r--r-- | functest/ci/testcases.yaml | 1 | ||||
-rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_base.py | 4 |
3 files changed, 12 insertions, 14 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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 97b2414e0..c2787fa7c 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -421,6 +421,7 @@ tiers: - case_name: vyos_vrouter project_name: functest + enabled: false criteria: 100 blocking: false description: >- diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py index a8525a382..e719145bf 100644 --- a/functest/opnfv_tests/openstack/vping/vping_base.py +++ b/functest/opnfv_tests/openstack/vping/vping_base.py @@ -181,10 +181,12 @@ class VPingBase(testcase.TestCase): else: raise Exception('VMs never became active') + self.stop_time = time.time() + if result != testcase.TestCase.EX_OK: + self.result = 0 return testcase.TestCase.EX_RUN_ERROR - self.stop_time = time.time() self.result = 100 return testcase.TestCase.EX_OK |