X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_tcp.py;h=8decac52b9d9800f2ca7323259c21329ae8cf13d;hb=2c8e0023f91882e53f06eb99c901b97fe013f981;hp=4a5c9bc4ff3587abe4f0ff1c44a720dabae09493;hpb=d5c60b96a3fd93916fc4af5c8d6d25625c28242e;p=vpp.git

diff --git a/test/test_tcp.py b/test/test_tcp.py
index 4a5c9bc4ff3..8decac52b9d 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
 
@@ -13,6 +13,10 @@ class TestTCP(VppTestCase):
     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)
@@ -32,10 +36,10 @@ 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=b"0",
+                                        sw_if_index=self.loop0.sw_if_index)
+        self.vapi.app_namespace_add_del(namespace_id=b"1",
+                                        sw_if_index=self.loop1.sw_if_index)
 
     def tearDown(self):
         for i in self.lo_interfaces:
@@ -45,14 +49,6 @@ class TestTCP(VppTestCase):
         self.vapi.session_enable_disable(is_enabled=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 """
 
@@ -74,18 +70,46 @@ class TestTCP(VppTestCase):
                               uri)
         if error:
             self.logger.critical(error)
-            self.assertEqual(error.find("failed"), -1)
+            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()
 
+
+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_enabled=1)
+
+    def tearDown(self):
+        super(TestTCPUnitTests, self).tearDown()
+        self.vapi.session_enable_disable(is_enabled=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)