From 1df1508d6b4abb27feda64c5401d5d986f88afd7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 8 May 2017 16:49:06 +0900 Subject: [PATCH] Disable QoS scenario tests differently The test was disabled due to some issues in the reference implementation. CIs for other implementations might not want to disable it. Closes-Bug: #1689238 Related-Bug: #1662109 Change-Id: I36357e2ef967db3a73c2341903cd18f5109a006b (cherry picked from commit 8528ea2b0e45379ce29ba6e1cfe17c5ae4197592) Conflicts: neutron/tests/contrib/gate_hook.sh --- neutron/tests/contrib/gate_hook.sh | 2 ++ neutron/tests/tempest/scenario/test_qos.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/tests/contrib/gate_hook.sh b/neutron/tests/contrib/gate_hook.sh index 896357beec0..d8a8c3a585a 100644 --- a/neutron/tests/contrib/gate_hook.sh +++ b/neutron/tests/contrib/gate_hook.sh @@ -93,6 +93,8 @@ case $VENV in if [[ "$VENV" =~ "dsvm-scenario" ]]; then load_conf_hook iptables_verify load_rc_hook ubuntu_image + # bug/1662109 + export DEVSTACK_GATE_TEMPEST_REGEX="^(?!.*(?:neutron\.tests\.tempest\.scenario\.test_qos.*))^neutron\.tests\.tempest\.scenario\." fi if [[ "$VENV" =~ "pecan" ]]; then load_conf_hook pecan diff --git a/neutron/tests/tempest/scenario/test_qos.py b/neutron/tests/tempest/scenario/test_qos.py index d16f294f376..b5584382d1b 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 from tempest.lib.common import ssh from tempest.lib import exceptions from tempest import test -import testtools from neutron.common import utils from neutron.services.qos import qos_consts @@ -83,7 +82,6 @@ class QoSTest(base.BaseTempestTestCase): @classmethod @test.requires_ext(extension="qos", service="network") @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT) - @testtools.skip('bug/1662109') def resource_setup(cls): super(QoSTest, cls).resource_setup()