summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssaf Muller <amuller@redhat.com>2017-04-26 13:23:55 -0400
committerMichael Johnson <johnsomor@gmail.com>2017-05-12 23:40:20 +0000
commitd2d535945dadb2040e254fb68bac9e9a71020394 (patch)
treedacb915c7b5ae1bb05effbf1e78a3db717f56efb
parentbc1fb460d53135d3871364eade300f7a41252ee8 (diff)
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 (cherry picked from commit 659d222d45da255972d2f22d7e62dc269720db61)
Notes
Notes (review): Code-Review+2: German Eichberger <German.eichberger@rackspace.com> Code-Review+2: Ihar Hrachyshka <ihrachys@redhat.com> Workflow+1: Ihar Hrachyshka <ihrachys@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 15 May 2017 19:16:35 +0000 Reviewed-on: https://review.openstack.org/461400 Project: openstack/neutron-lbaas Branch: refs/heads/stable/newton
-rw-r--r--neutron_lbaas/tests/tempest/v2/scenario/base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/neutron_lbaas/tests/tempest/v2/scenario/base.py b/neutron_lbaas/tests/tempest/v2/scenario/base.py
index e7fe8b5..f6538c7 100644
--- a/neutron_lbaas/tests/tempest/v2/scenario/base.py
+++ b/neutron_lbaas/tests/tempest/v2/scenario/base.py
@@ -27,7 +27,6 @@ from six.moves.urllib import error
27from six.moves.urllib import request as urllib2 27from six.moves.urllib import request as urllib2
28from tempest.common import waiters 28from tempest.common import waiters
29from tempest import config 29from tempest import config
30from tempest import exceptions
31from tempest.lib.common.utils import test_utils 30from tempest.lib.common.utils import test_utils
32from tempest.lib import exceptions as lib_exc 31from tempest.lib import exceptions as lib_exc
33from tempest import test 32from tempest import test
@@ -521,7 +520,7 @@ class BaseTestCase(manager.NetworkScenarioTest):
521 if (time.time() - start) > timeout: 520 if (time.time() - start) > timeout:
522 message = ("Timed out trying to connect to {0}:{1} after " 521 message = ("Timed out trying to connect to {0}:{1} after "
523 "{2} seconds".format(check_ip, port, timeout)) 522 "{2} seconds".format(check_ip, port, timeout))
524 raise exceptions.TimeoutException(message) 523 raise lib_exc.TimeoutException(message)
525 524
526 def _send_requests(self, vip_ip, servers): 525 def _send_requests(self, vip_ip, servers):
527 counters = dict.fromkeys(servers, 0) 526 counters = dict.fromkeys(servers, 0)