gate_hook: Stop including localrc
- It isn't necessary (stackrc should be enough) - It's incompatible with recent gate changes to support local.conf [1] Also stopped using _list_* methods for tempest tests since they were removed in tempest. [1] http://lists.openstack.org/pipermail/openstack-dev/2017-February/112872.html Closes-Bug: #1667736 Related-Bug: #1667824 Also, the following patch is cherry-picked together to pass the gate. -------------------------------------- Switch to use test_utils.call_until_true test.call_until_true has been deprecated since Newton on Tempest side, and now Tempest provides test_utils.call_until_true as the stable library method. So this patch switches to use the stable method before removing old test.call_until_true on Tempest side. Change-Id: I75d289f27d4e5e02243150dfaca08824d9e5aafa Needed-by: Ide11a7434a4714e5d2211af1803333535f557370 -------------------------------------- Change-Id: Ib4c9d086bd8c1d5c02be7ba47bdd306f0813659f (cherry picked from commit44c3d3d29b
) (cherry picked from commit9d052fa5f3
) Conflicts: neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaas_extensions.py neutron_fwaas/tests/tempest_plugin/tests/api/test_fwaasv2_extensions.py neutron_fwaas/tests/tempest_plugin/tests/scenario/test_fwaas_v2.py
This commit is contained in:
parent
40c81acb7f
commit
5cdc772683
|
@ -23,7 +23,6 @@ source $TOP_DIR/functions
|
|||
source $TOP_DIR/inc/meta-config
|
||||
source $TOP_DIR/stackrc
|
||||
source $TOP_DIR/lib/database
|
||||
source $TOP_DIR/localrc
|
||||
|
||||
# Install_databases [install_pg]
|
||||
# Tweak the script accordingly if we need psql in future
|
||||
|
|
|
@ -17,6 +17,7 @@ import six
|
|||
from tempest import config
|
||||
from tempest import exceptions
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
|
@ -99,8 +100,8 @@ class FWaaSExtensionTestJSON(base.BaseFWaaSTest):
|
|||
firewall = firewall['firewall']
|
||||
return firewall['status'] in target_states
|
||||
|
||||
if not test.call_until_true(_wait, CONF.network.build_timeout,
|
||||
CONF.network.build_interval):
|
||||
if not test_utils.call_until_true(_wait, CONF.network.build_timeout,
|
||||
CONF.network.build_interval):
|
||||
m = ("Timed out waiting for firewall %s to reach %s state(s)" %
|
||||
(fw_id, target_states))
|
||||
raise exceptions.TimeoutException(m)
|
||||
|
|
|
@ -18,6 +18,7 @@ import six
|
|||
from tempest import config
|
||||
from tempest import exceptions
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
|
@ -140,8 +141,8 @@ class FWaaSv2ExtensionTestJSON(v2_base.BaseFWaaSTest):
|
|||
firewall_group = firewall_group['firewall_group']
|
||||
return firewall_group['status'] in target_states
|
||||
|
||||
if not test.call_until_true(_wait, CONF.network.build_timeout,
|
||||
CONF.network.build_interval):
|
||||
if not test_utils.call_until_true(_wait, CONF.network.build_timeout,
|
||||
CONF.network.build_interval):
|
||||
m = ("Timed out waiting for firewall_group %s to reach %s "
|
||||
"state(s)" %
|
||||
(fwg_id, target_states))
|
||||
|
|
Loading…
Reference in New Issue