-#!/usr/bin/env python
+#!/usr/bin/env python3
import unittest
def setUpClass(cls):
super(TestString, cls).setUpClass()
+ @classmethod
+ def tearDownClass(cls):
+ super(TestString, cls).tearDownClass()
+
def setUp(self):
super(TestString, self).setUp()
""" 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",
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)