build: install generated api enum and type headers

[vpp.git] / test / framework.py

diff --git a/test/framework.py b/test/framework.py
index 62b99e5..e3c605b 100644 (file)
--- a/test/framework.py
+++ b/test/framework.py
@@ -753,6 +753,20 @@ class VppTestCase(unittest.TestCase):
         # add to the list of captures with current timestamp
         cls._captures.append((time.time(), cap_name))
 
+    @classmethod
+    def get_vpp_time(cls):
+        return float(cls.vapi.cli('show clock').replace("Time now ", ""))
+
+    @classmethod
+    def sleep_on_vpp_time(cls, sec):
+        """ Sleep according to time in VPP world """
+        # On a busy system with many processes
+        # we might end up with VPP time being slower than real world
+        # So take that into account when waiting for VPP to do something
+        start_time = cls.get_vpp_time()
+        while cls.get_vpp_time() - start_time < sec:
+            cls.sleep(0.1)
+
     @classmethod
     def pg_start(cls):
         """ Enable the PG, wait till it is done, then clean up """
@@ -1563,12 +1577,12 @@ class Worker(Thread):
         self.logger.info("Executable `{app}' wrote to stdout:"
                          .format(app=self.app_name))
         self.logger.info(single_line_delim)
-        self.logger.info(out)
+        self.logger.info(out.decode('utf-8'))
         self.logger.info(single_line_delim)
         self.logger.info("Executable `{app}' wrote to stderr:"
                          .format(app=self.app_name))
         self.logger.info(single_line_delim)
-        self.logger.info(err)
+        self.logger.info(err.decode('utf-8'))
         self.logger.info(single_line_delim)
         self.result = self.process.returncode