X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_string.py;h=c507c7559cab18e2733ec2b1ccbc8a9ba1e93f36;hb=755042dec0fcc733d456adc2a74042c529eff039;hp=b44489e3038078cbe1eadb5e9b113c1c30c7cdfc;hpb=b0598497afde60146fe8480331c9f96e7a79475a;p=vpp.git

diff --git a/test/test_string.py b/test/test_string.py
index b44489e3038..c507c7559ca 100644
--- a/test/test_string.py
+++ b/test/test_string.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
@@ -13,6 +13,10 @@ class TestString(VppTestCase):
     def setUpClass(cls):
         super(TestString, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestString, cls).tearDownClass()
+
     def setUp(self):
         super(TestString, self).setUp()
 
@@ -23,9 +27,8 @@ class TestString(VppTestCase):
         """ String unit tests """
         names = ["memcpy_s",
                  "clib_memcmp", "clib_memcpy", "clib_memset",
-                 "clib_strcat", "clib_strcmp", "clib_strcpy",
-                 "clib_strncat", "clib_strncmp", "clib_strncpy",
-                 "clib_strnlen", "clib_strstr", "clib_strtok",
+                 "clib_strcmp", "clib_strncmp", "clib_strncpy",
+                 "clib_strnlen", "clib_strtok",
                  "memcmp_s", "memcpy_s", "memset_s ",
                  "strcat_s", "strcmp_s", "strcpy_s",
                  "strncat_s", "strncmp_s", "strncpy_s",
@@ -35,7 +38,8 @@ class TestString(VppTestCase):
             error = self.vapi.cli("test string " + name)
             if error.find("failed") != -1:
                 self.logger.critical("FAILURE in the " + name + " test")
-                self.assertEqual(error.find("failed"), -1)
+                self.assertNotIn("failed", error)
+
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)