openstack
/
neutron
Code Issues Proposed changes

Merge "Disable QoS scenario tests differently"

This commit is contained in:
Jenkins 2017-06-02 19:22:21 +00:00 committed by Gerrit Code Review
parent 2faa7af19d 8528ea2b0e
commit 9a040544dc
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

@ -105,6 +105,8 @@ case $VENV in
load_conf_hook osprofiler
if [[ "$VENV" =~ "dsvm-scenario" ]]; then
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" =~ "dsvm-scenario-linuxbridge" ]]; then
load_conf_hook iptables_verify

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

@ -20,7 +20,6 @@ from oslo_log import log as logging
from tempest.lib import decorators
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()