openstack
/
neutron
Code Issues Proposed changes

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 8528ea2b0e)
Conflicts:
	neutron/tests/contrib/gate_hook.sh
This commit is contained in:
YAMAMOTO Takashi 2017-05-08 16:49:06 +09:00 committed by Ihar Hrachyshka
parent 7b67e63e97
commit 1df1508d6b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/contrib/gate_hook.sh
View File

@ -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

2
neutron/tests/tempest/scenario/test_qos.py
View File

@ -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()