openstack
/
neutron
Code Issues Proposed changes

Merge "Mock OVSBrdge.clear_minimum_bandwidth_qos in fullstack tests"

This commit is contained in:
Zuul 2019-04-05 09:24:33 +00:00 committed by Gerrit Code Review
parent 6df95b72cf 531fdc336b
commit 5e1681a389
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/fullstack/agents/ovs_agent.py
View File

@ -15,8 +15,10 @@
import sys
import mock
from oslo_config import cfg
from neutron.agent.common import ovs_lib
from neutron.services.trunk.drivers.openvswitch.agent \
import driver as trunk_driver
from neutron.tests.common.agents import ovs_agent
@ -42,7 +44,8 @@ def main():
# ovs-vswitchd processes for each test will be isolated in separate
# namespace
monkeypatch_init_handler()
ovs_agent.main()
with mock.patch.object(ovs_lib.OVSBridge, 'clear_minimum_bandwidth_qos'):
ovs_agent.main()
if __name__ == "__main__":

3
neutron/tests/fullstack/test_qos.py
View File

@ -23,7 +23,6 @@ import testscenarios
from neutron.agent.common import ovs_lib
from neutron.agent.linux import tc_lib
from neutron.common import utils
from neutron.tests import base as tests_base
from neutron.tests.common.agents import l2_extensions
from neutron.tests.fullstack import base
from neutron.tests.fullstack.resources import config as fullstack_config
@ -637,7 +636,6 @@ class _TestMinBwQoS(BaseQoSRuleTestCase):
rule['qos_policy_id'] = qos_policy_id
qos_policy['rules'].append(rule)
@tests_base.unstable_test('bug 1819125')
def test_min_bw_qos_policy_rule_lifecycle(self):
new_limit = MIN_BANDWIDTH - 100
@ -687,7 +685,6 @@ class TestMinBwQoSOvs(_TestMinBwQoS, base.BaseFullStackTestCase):
self.fail('"%s" direction not implemented'
% constants.INGRESS_DIRECTION)
@tests_base.unstable_test('bug 1819125')
def test_bw_limit_qos_port_removed(self):
"""Test if rate limit config is properly removed when whole port is
removed.