make test: fix missing log/packet messages

[vpp.git] / test / test_ip6.py

diff --git a/test/test_ip6.py b/test/test_ip6.py
index bff829b..06b15f9 100644 (file)
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -9,6 +9,7 @@ from vpp_sub_interface import VppSubInterface, VppDot1QSubint
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, Dot1Q
 from scapy.layers.inet6 import IPv6, UDP
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, Dot1Q
 from scapy.layers.inet6 import IPv6, UDP

+from util import ppp

 
 
 class TestIPv6(VppTestCase):
 
 
 class TestIPv6(VppTestCase):


@@ -103,7 +104,7 @@ class TestIPv6(VppTestCase):
                 counter += 1
                 if counter / count * 100 > percent:
                     self.logger.info("Configure %d FIB entries .. %d%% done" %
                 counter += 1
                 if counter / count * 100 > percent:
                     self.logger.info("Configure %d FIB entries .. %d%% done" %

-                         (count, percent))
+                                     (count, percent))

                     percent += 1
 
     def create_stream(self, src_if, packet_sizes):
                     percent += 1
 
     def create_stream(self, src_if, packet_sizes):


@@ -171,16 +172,14 @@ class TestIPv6(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:

-                self.logger.error("Unexpected or invalid packet:")
-                self.logger.error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet:", packet))

                 raise
         for i in self.interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
                 i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])
                 raise
         for i in self.interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
                 i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])

-            self.assertTrue(
-                remaining_packet is None,
-                "Interface %s: Packet expected from interface %s didn't arrive" %
-                (dst_if.name, i.name))
+            self.assertTrue(remaining_packet is None,
+                            "Interface %s: Packet expected from interface %s "
+                            "didn't arrive" % (dst_if.name, i.name))

 
     def test_fib(self):
         """ IPv6 FIB test
 
     def test_fib(self):
         """ IPv6 FIB test