Browse Source

Merge "[Fullstack] Unmark test_dscp_marking_packets as unstable"

changes/57/544057/1
Zuul 4 years ago
committed by Gerrit Code Review
parent
commit
328df6a5cc
  1. 10
      neutron/tests/common/agents/l2_extensions.py
  2. 2
      neutron/tests/fullstack/test_qos.py

10
neutron/tests/common/agents/l2_extensions.py

@ -118,20 +118,10 @@ def wait_for_dscp_marked_packet(sender_vm, receiver_vm, dscp_mark):
pattern = r"(?P<packets_count>^\d+) packets received by filter"
for line in tcpdump_async.iter_stderr():
# TODO(slaweq): Debug logging added to help troubleshooting bug
# https://bugs.launchpad.net/neutron/+bug/1733649
# once it will be closed this log can be removed
LOG.debug("Tcpdump error output line: %s", line)
m = re.match(pattern, line)
if m and int(m.group("packets_count")) != 0:
return
# TODO(slaweq): Debug logging added to help troubleshooting bug
# https://bugs.launchpad.net/neutron/+bug/1733649
# once it will be closed this log can be removed
for line in tcpdump_async.iter_stdout():
LOG.debug("Tcpdump output line: %s", line)
raise TcpdumpException(
"No packets marked with DSCP = %(dscp_mark)s received from %(src)s "
"to %(dst)s" % {'dscp_mark': dscp_mark,

2
neutron/tests/fullstack/test_qos.py

@ -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 environment
@ -333,7 +332,6 @@ class _TestDscpMarkingQoS(BaseQoSRuleTestCase):
body={'port': {'qos_policy_id': None}})
self._wait_for_dscp_marking_rule_removed(vm)
@tests_base.unstable_test("bug 1733649")
def test_dscp_marking_packets(self):
# Create port (vm) which will be used to received and test packets
receiver_port = self.safe_client.create_port(

Loading…
Cancel
Save