openstack
/
neutron-lbaas
Code Issues Proposed changes

Use Tempest TimeoutException from tempest.lib 

TimeoutException was moved to tempest.lib.exceptions and
deleted from tempest.exceptions. This patch uses the up to date
location.

Change-Id: I0a563ac6e70795c277dd6be3d05ace92de72b46d
Closes-Bug: #1686468
This commit is contained in:
Assaf Muller 2017-04-26 13:23:55 -04:00
parent 0ce11e9f27
commit 659d222d45
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron_lbaas/tests/tempest/v2/scenario/base.py
View File

@ -26,7 +26,6 @@ from six.moves.urllib import error
from six.moves.urllib import request as urllib2 from six.moves.urllib import request as urllib2
from tempest.common import waiters from tempest.common import waiters
from tempest import config from tempest import config
from tempest import exceptions
from tempest.lib.common.utils import test_utils from tempest.lib.common.utils import test_utils
from tempest.lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
from tempest import test from tempest import test
@ -523,7 +522,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
if (time.time() - start) > timeout: if (time.time() - start) > timeout:
message = ("Timed out trying to connect to {0}:{1} after " message = ("Timed out trying to connect to {0}:{1} after "
"{2} seconds".format(check_ip, port, timeout)) "{2} seconds".format(check_ip, port, timeout))
raise exceptions.TimeoutException(message) raise lib_exc.TimeoutException(message)
def _send_requests(self, vip_ip, servers): def _send_requests(self, vip_ip, servers):
counters = dict.fromkeys(servers, 0) counters = dict.fromkeys(servers, 0)