X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_tcp.py;h=de1263621070f26ff3eb748145ce787976327b3f;hb=fe45f8f5afbf34d68cf992cc32b12432a82cdb38;hp=3b36bdf416be1fd40d2e025cadfb1a9693cbbd4c;hpb=4399c2eb848b79762ff52a95fa5d9fab222c73bd;p=vpp.git

diff --git a/test/test_tcp.py b/test/test_tcp.py
index 3b36bdf416b..de126362107 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
@@ -7,16 +7,20 @@ from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 
 class TestTCP(VppTestCase):
-    """ TCP Test Case """
+    """TCP Test Case"""
 
     @classmethod
     def setUpClass(cls):
         super(TestTCP, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestTCP, cls).tearDownClass()
+
     def setUp(self):
         super(TestTCP, self).setUp()
-        self.vapi.session_enable_disable(is_enabled=1)
-        self.create_loopback_interfaces(range(2))
+        self.vapi.session_enable_disable(is_enable=1)
+        self.create_loopback_interfaces(2)
 
         table_id = 0
 
@@ -32,60 +36,90 @@ class TestTCP(VppTestCase):
             table_id += 1
 
         # Configure namespaces
-        self.vapi.app_namespace_add(namespace_id="0",
-                                    sw_if_index=self.loop0.sw_if_index)
-        self.vapi.app_namespace_add(namespace_id="1",
-                                    sw_if_index=self.loop1.sw_if_index)
+        self.vapi.app_namespace_add_del(
+            namespace_id="0", sw_if_index=self.loop0.sw_if_index
+        )
+        self.vapi.app_namespace_add_del(
+            namespace_id="1", sw_if_index=self.loop1.sw_if_index
+        )
 
     def tearDown(self):
         for i in self.lo_interfaces:
             i.unconfig_ip4()
             i.set_table_ip4(0)
             i.admin_down()
-        self.vapi.session_enable_disable(is_enabled=0)
+        self.vapi.session_enable_disable(is_enable=0)
         super(TestTCP, self).tearDown()
 
-    def test_tcp_unittest(self):
-        """ TCP Unit Tests """
-        error = self.vapi.cli("test tcp all")
-
-        if error:
-            self.logger.critical(error)
-        self.assertEqual(error.find("failed"), -1)
-
     def test_tcp_transfer(self):
-        """ TCP echo client/server transfer """
+        """TCP echo client/server transfer"""
 
         # Add inter-table routes
-        ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32,
-                            [VppRoutePath("0.0.0.0",
-                                          0xffffffff,
-                                          nh_table_id=1)])
-        ip_t10 = VppIpRoute(self, self.loop0.local_ip4, 32,
-                            [VppRoutePath("0.0.0.0",
-                                          0xffffffff,
-                                          nh_table_id=0)], table_id=1)
+        ip_t01 = VppIpRoute(
+            self,
+            self.loop1.local_ip4,
+            32,
+            [VppRoutePath("0.0.0.0", 0xFFFFFFFF, nh_table_id=1)],
+        )
+        ip_t10 = VppIpRoute(
+            self,
+            self.loop0.local_ip4,
+            32,
+            [VppRoutePath("0.0.0.0", 0xFFFFFFFF, nh_table_id=0)],
+            table_id=1,
+        )
         ip_t01.add_vpp_config()
         ip_t10.add_vpp_config()
 
         # Start builtin server and client
         uri = "tcp://" + self.loop0.local_ip4 + "/1234"
-        error = self.vapi.cli("test echo server appns 0 fifo-size 4 uri " +
-                              uri)
+        error = self.vapi.cli("test echo server appns 0 fifo-size 4 uri " + uri)
         if error:
             self.logger.critical(error)
-            self.assertEqual(error.find("failed"), -1)
-
-        error = self.vapi.cli("test echo client mbytes 10 appns 1 " +
-                              "fifo-size 4 no-output test-bytes " +
-                              "syn-timeout 2 uri " + uri)
+            self.assertNotIn("failed", error)
+
+        error = self.vapi.cli(
+            "test echo client mbytes 10 appns 1 "
+            + "fifo-size 4 no-output test-bytes "
+            + "syn-timeout 2 uri "
+            + uri
+        )
         if error:
             self.logger.critical(error)
-            self.assertEqual(error.find("failed"), -1)
+            self.assertNotIn("failed", error)
 
         # Delete inter-table routes
         ip_t01.remove_vpp_config()
         ip_t10.remove_vpp_config()
 
-if __name__ == '__main__':
+
+class TestTCPUnitTests(VppTestCase):
+    "TCP Unit Tests"
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestTCPUnitTests, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestTCPUnitTests, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestTCPUnitTests, self).setUp()
+        self.vapi.session_enable_disable(is_enable=1)
+
+    def tearDown(self):
+        super(TestTCPUnitTests, self).tearDown()
+        self.vapi.session_enable_disable(is_enable=0)
+
+    def test_tcp_unittest(self):
+        """TCP Unit Tests"""
+        error = self.vapi.cli("test tcp all")
+
+        if error:
+            self.logger.critical(error)
+        self.assertNotIn("failed", error)
+
+
+if __name__ == "__main__":
     unittest.main(testRunner=VppTestRunner)