summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 02:57:17 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 02:57:17 +0000
commit27f2f8e44f10bde0968cde96cc5ce443408ef120 (patch)
tree57e860eee1e0cdf31ee413977e2246dcec042a6e
parent71551a058fcc8ce67aefe27fca54258276e34d09 (diff)
parent1df1508d6b4abb27feda64c5401d5d986f88afd7 (diff)
Merge "Disable QoS scenario tests differently" into stable/ocata
-rw-r--r--neutron/tests/contrib/gate_hook.sh2
-rw-r--r--neutron/tests/tempest/scenario/test_qos.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh
index 896357b..d8a8c3a 100644
--- a/neutron/tests/contrib/gate_hook.sh
+++ b/neutron/tests/contrib/gate_hook.sh
@@ -93,6 +93,8 @@ case $VENV in
93 if [[ "$VENV" =~ "dsvm-scenario" ]]; then 93 if [[ "$VENV" =~ "dsvm-scenario" ]]; then
94 load_conf_hook iptables_verify 94 load_conf_hook iptables_verify
95 load_rc_hook ubuntu_image 95 load_rc_hook ubuntu_image
96 # bug/1662109
97 export DEVSTACK_GATE_TEMPEST_REGEX="^(?!.*(?:neutron\.tests\.tempest\.scenario\.test_qos.*))^neutron\.tests\.tempest\.scenario\."
96 fi 98 fi
97 if [[ "$VENV" =~ "pecan" ]]; then 99 if [[ "$VENV" =~ "pecan" ]]; then
98 load_conf_hook pecan 100 load_conf_hook pecan
diff --git a/neutron/tests/tempest/scenario/test_qos.py b/neutron/tests/tempest/scenario/test_qos.py
index d16f294..b558438 100644
--- a/neutron/tests/tempest/scenario/test_qos.py
+++ b/neutron/tests/tempest/scenario/test_qos.py
@@ -20,7 +20,6 @@ from oslo_log import log as logging
20from tempest.lib.common import ssh 20from tempest.lib.common import ssh
21from tempest.lib import exceptions 21from tempest.lib import exceptions
22from tempest import test 22from tempest import test
23import testtools
24 23
25from neutron.common import utils 24from neutron.common import utils
26from neutron.services.qos import qos_consts 25from neutron.services.qos import qos_consts
@@ -83,7 +82,6 @@ class QoSTest(base.BaseTempestTestCase):
83 @classmethod 82 @classmethod
84 @test.requires_ext(extension="qos", service="network") 83 @test.requires_ext(extension="qos", service="network")
85 @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT) 84 @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
86 @testtools.skip('bug/1662109')
87 def resource_setup(cls): 85 def resource_setup(cls):
88 super(QoSTest, cls).resource_setup() 86 super(QoSTest, cls).resource_setup()
89 87