crypto crypto-openssl: support hashing operations

[vpp.git] / test / test_vlib.py

diff --git a/test/test_vlib.py b/test/test_vlib.py
index 8bc5f57..a9a5f6a 100644 (file)
--- a/test/test_vlib.py
+++ b/test/test_vlib.py
@@ -11,7 +11,7 @@ from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 class TestVlib(VppTestCase):
     """ Vlib Unit Test Cases """
-    worker_config = "workers 1"
+    vpp_worker_count = 1
 
     @classmethod
     def setUpClass(cls):
@@ -44,13 +44,12 @@ class TestVlib(VppTestCase):
                 "   incrementing 30\n"
                 "   }\n"
                 "}\n",
-                "elog trace dispatch",
+                "event-logger trace dispatch",
                 "event-logger stop",
                 "event-logger clear",
                 "event-logger resize 102400",
                 "event-logger restart",
                 "pcap dispatch trace on max 100 buffer-trace pg-input 15",
-                "set pmc instructions-per-clock",
                 "pa en",
                 "show event-log 100 all",
                 "event-log save",
@@ -131,14 +130,14 @@ class TestVlib(VppTestCase):
                 "   incrementing 30\n"
                 "   }\n"
                 "}\n",
-                "elog trace",
-                "elog trace enable",
-                "elog trace api cli barrier",
+                "event-logger trace",
+                "event-logger trace enable",
+                "event-logger trace api cli barrier",
                 "pa en",
                 "show interface bogus",
-                "elog trace disable api cli barrier",
-                "elog trace circuit-node ethernet-input",
-                "elog trace circuit-node ethernet-input disable",
+                "event-logger trace disable api cli barrier",
+                "event-logger trace circuit-node ethernet-input",
+                "event-logger trace circuit-node ethernet-input disable",
                 "clear interfaces",
                 "test vlib",
                 "test vlib2",
@@ -193,7 +192,8 @@ class TestVlib(VppTestCase):
         """ Private Binary API Segment Test (takes 70 seconds) """
 
         vat_path = self.vpp_bin + '_api_test'
-        vat = pexpect.spawn(vat_path, ['socket-name', self.api_sock])
+        vat = pexpect.spawn(vat_path, ['socket-name',
+                                       self.get_api_sock_path()])
         vat.expect("vat# ", timeout=10)
         vat.sendline('sock_init_shm')
         vat.expect("vat# ", timeout=10)
@@ -204,5 +204,6 @@ class TestVlib(VppTestCase):
         time.sleep(70)
         self.logger.info("Reaper should be complete...")
 
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)