Merge "Disable QoS scenario tests differently" into stable/ocata

This commit is contained in:
Jenkins 2017-06-16 02:57:17 +00:00 committed by Gerrit Code Review
commit 27f2f8e44f
2 changed files with 2 additions and 2 deletions

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

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