openstack/neutron-tempest-plugin
Code Issues Proposed changes

Merge "Fix raising TimeoutException in tests"

Browse Source
This commit is contained in:
Zuul 2018-10-05 19:59:45 +00:00 committed by Gerrit Code Review
commit 2184942995
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_tempest_plugin/scenario/test_floatingip.py
View File

@ -21,6 +21,7 @@ from tempest.common import utils
from tempest.common import waiters from tempest.common import waiters
from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest.lib import decorators from tempest.lib import decorators
from tempest.lib import exceptions
import testscenarios import testscenarios
from testscenarios.scenarios import multiply_scenarios from testscenarios.scenarios import multiply_scenarios
@ -28,7 +29,6 @@ from neutron_tempest_plugin.api import base as base_api
from neutron_tempest_plugin.common import ssh from neutron_tempest_plugin.common import ssh
from neutron_tempest_plugin.common import utils as common_utils from neutron_tempest_plugin.common import utils as common_utils
from neutron_tempest_plugin import config from neutron_tempest_plugin import config
from neutron_tempest_plugin import exceptions
from neutron_tempest_plugin.scenario import base from neutron_tempest_plugin.scenario import base
from neutron_tempest_plugin.scenario import constants from neutron_tempest_plugin.scenario import constants
from neutron_tempest_plugin.scenario import test_qos from neutron_tempest_plugin.scenario import test_qos

4
neutron_tempest_plugin/services/network/json/network_client.py
View File

@ -17,8 +17,6 @@ from six.moves.urllib import parse as urlparse
from tempest.lib.common import rest_client as service_client from tempest.lib.common import rest_client as service_client
from tempest.lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
from neutron_tempest_plugin import exceptions
class NetworkClientJSON(service_client.RestClient): class NetworkClientJSON(service_client.RestClient):
@ -280,7 +278,7 @@ class NetworkClientJSON(service_client.RestClient):
if self.is_resource_deleted(resource_type, id): if self.is_resource_deleted(resource_type, id):
return return
if int(time.time()) - start_time >= self.build_timeout: if int(time.time()) - start_time >= self.build_timeout:
raise exceptions.TimeoutException raise lib_exc.TimeoutException
time.sleep(self.build_interval) time.sleep(self.build_interval)
def is_resource_deleted(self, resource_type, id): def is_resource_deleted(self, resource_type, id):