X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_sctp.py;h=e1faa9a0c1db2e738b2009a4049f51aa6656a485;hb=f682facb272ba7a1adc08c9c464df140d4f4b714;hp=a2f5e6a45da2545bd2b43a61fc2320dc9020b311;hpb=4399c2eb848b79762ff52a95fa5d9fab222c73bd;p=vpp.git

diff --git a/test/test_sctp.py b/test/test_sctp.py
index a2f5e6a45da..e1faa9a0c1d 100644
--- a/test/test_sctp.py
+++ b/test/test_sctp.py
@@ -13,10 +13,14 @@ class TestSCTP(VppTestCase):
     def setUpClass(cls):
         super(TestSCTP, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestSCTP, cls).tearDownClass()
+
     def setUp(self):
         super(TestSCTP, self).setUp()
         self.vapi.session_enable_disable(is_enabled=1)
-        self.create_loopback_interfaces(range(2))
+        self.create_loopback_interfaces(2)
 
         table_id = 0
 
@@ -32,10 +36,10 @@ class TestSCTP(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:
@@ -62,19 +66,21 @@ class TestSCTP(VppTestCase):
 
         # Start builtin server and client
         uri = "sctp://" + 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 " +
+                              "no-echo uri " + 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" +
+        error = self.vapi.cli("test echo client mbytes 10 no-return " +
+                              " appns 1" +
                               " fifo-size 4" +
-                              " no-output test-bytes syn-timeout 20 " +
+                              " no-output test-bytes syn-timeout 3" +
+                              " test-timeout 30" +
                               " 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()