From: Assaf Muller <amuller@redhat.com>
Date: Fri, 28 Aug 2015 20:41:07 +0000 (-0400)
Subject: Improve logging upon failure in iptables functional tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=013fdcd2a6d45dbe4de5d6e7077e5e9b60985ef9;p=openstack-build%2Fneutron-build.git

Improve logging upon failure in iptables functional tests

This will help us nail down a more accurate and efficient logstash
query.

Change-Id: Iee4238e358f7b056e373c7be8d6aa3202117a680
Related-Bug: #1478847
---

diff --git a/neutron/tests/functional/agent/linux/test_iptables.py b/neutron/tests/functional/agent/linux/test_iptables.py
index 2130ec8cc..93c03e672 100644
--- a/neutron/tests/functional/agent/linux/test_iptables.py
+++ b/neutron/tests/functional/agent/linux/test_iptables.py
@@ -83,14 +83,23 @@ class IptablesManagerTestCase(functional_base.BaseSudoTestCase):
             self.client.namespace, self.server.namespace,
             self.server.ip, self.port, protocol)
         self.addCleanup(netcat.stop_processes)
-        self.assertTrue(netcat.test_connectivity())
+        filter_params = 'direction %s, port %s and protocol %s' % (
+            direction, port, protocol)
+        self.assertTrue(netcat.test_connectivity(),
+                        'Failed connectivity check before applying a filter '
+                        'with %s' % filter_params)
         self.filter_add_rule(
             fw_manager, self.server.ip, direction, protocol, port)
-        with testtools.ExpectedException(RuntimeError):
+        with testtools.ExpectedException(
+                RuntimeError,
+                msg='Wrongfully passed a connectivity check after applying '
+                    'a filter with %s' % filter_params):
             netcat.test_connectivity()
         self.filter_remove_rule(
             fw_manager, self.server.ip, direction, protocol, port)
-        self.assertTrue(netcat.test_connectivity(True))
+        self.assertTrue(netcat.test_connectivity(True),
+                        'Failed connectivity check after removing a filter '
+                        'with %s' % filter_params)
 
     def test_icmp(self):
         self.client.assert_ping(self.server.ip)