From 6407a71d06c81f937c21079fc54aa2709a223e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= Date: Thu, 1 Feb 2018 14:42:02 +0100 Subject: [PATCH] [Fullstack] Unmark test_dscp_marking_packets as unstable Bug 1733649 is now closed with patch Ia3522237dc787edb90d162ac4a5535ff5d2a03d5 This commit removes decorator which marked fullstack test test_qos.TestDscpMarkingQoSOvs.test_dscp_marking_packets as unstable. This commit removes also some additional logs of tcpdump's output added only as temporary "debug" solution. Change-Id: I0343b1b4fd8d6eed1c26838bf70bce9868e6ee0c Related-Bug: #1733649 --- neutron/tests/common/agents/l2_extensions.py | 10 ---------- neutron/tests/fullstack/test_qos.py | 2 -- 2 files changed, 12 deletions(-) diff --git a/neutron/tests/common/agents/l2_extensions.py b/neutron/tests/common/agents/l2_extensions.py index 37fa010bcb9..37edc51078b 100644 --- a/neutron/tests/common/agents/l2_extensions.py +++ b/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^\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, diff --git a/neutron/tests/fullstack/test_qos.py b/neutron/tests/fullstack/test_qos.py index 0f4ea6bfff8..341b4413e1d 100644 --- a/neutron/tests/fullstack/test_qos.py +++ b/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(