X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_l2xc.py;h=bc653f0b4fb833b57f74675f971a65ed6d5e4af0;hb=b4e5e50fe;hp=2ec4af9288ee348e5c3ce588f5a9bfdf7b020c6c;hpb=dab231a11ec96e829b22ff80c612333edc5a93e6;p=vpp.git

diff --git a/test/test_l2xc.py b/test/test_l2xc.py
index 2ec4af9288e..bc653f0b4fb 100644
--- a/test/test_l2xc.py
+++ b/test/test_l2xc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random
@@ -76,6 +76,10 @@ class TestL2xc(VppTestCase):
             super(TestL2xc, cls).tearDownClass()
             raise
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestL2xc, cls).tearDownClass()
+
     def setUp(self):
         super(TestL2xc, self).setUp()
         self.reset_packet_infos()
@@ -85,8 +89,9 @@ class TestL2xc(VppTestCase):
         Show various debug prints after each test.
         """
         super(TestL2xc, self).tearDown()
-        if not self.vpp_dead:
-            self.logger.info(self.vapi.ppcli("show l2patch"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.ppcli("show l2patch"))
 
     @classmethod
     def create_host_lists(cls, count):
@@ -147,7 +152,7 @@ class TestL2xc(VppTestCase):
             try:
                 ip = packet[IP]
                 udp = packet[UDP]
-                payload_info = self.payload_to_info(str(packet[Raw]))
+                payload_info = self.payload_to_info(packet[Raw])
                 packet_index = payload_info.index
                 self.assertEqual(payload_info.dst, dst_sw_if_index)
                 self.logger.debug("Got packet on port %s: src=%u (id=%u)" %