Fix performance test (#131)

Author: jumaffre

cmake/common.cmake

@@ -635,7 +635,7 @@ function(add_perf_test)
 
   add_test(
     NAME ${PARSED_ARGS_NAME}
-    COMMAND ${PYTHON} ${PARSED_ARGS_PYTHON_SCRIPT}
+    COMMAND python3 ${PARSED_ARGS_PYTHON_SCRIPT}
       -b .
       --label ${PARSED_ARGS_NAME}
       -c ${PARSED_ARGS_CLIENT_BIN}

tests/infra/rates.py

@@ -7,7 +7,7 @@
 
 from loguru import logger as LOG
 
-COMMIT_COUNT_CUTTOF = 20
+COMMIT_COUNT_CUTTOF = 10
 
 
 class TxRates:

tests/infra/remote.py

@@ -237,15 +237,17 @@ def _cmd(self):
     def _dbg(self):
         return "cd {} && {} --args ./{}".format(self.root, DBG, " ".join(self.cmd))
 
-    def wait_for_stdout_line(self, line, timeout):
+    def _connect_new(self):
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
         client.connect(self.hostname)
+        return client
+
+    def wait_for_stdout_line(self, line, timeout):
+        client = self._connect_new()
         try:
             for _ in range(timeout):
-                _, stdout, _ = self.client.exec_command(
-                    "grep -F '{}' {}/out".format(line, self.root)
-                )
+                _, stdout, _ = client.exec_command(f"grep -F '{line}' {self.root}/out")
                 if stdout.channel.recv_exit_status() == 0:
                     return
                 time.sleep(1)
@@ -255,6 +257,19 @@ def wait_for_stdout_line(self, line, timeout):
         finally:
             client.close()
 
+    def print_result(self, lines):
+        client = self._connect_new()
+        LOG.error("print_result remote")
+        try:
+            _, stdout, _ = client.exec_command(f"tail -{lines} {self.root}/out")
+            if stdout.channel.recv_exit_status() == 0:
+                LOG.success(f"Result for {self.name}:")
+                for line in stdout.read().splitlines():
+                    LOG.debug(line.decode())
+                return
+        finally:
+            client.close()
+
 
 @contextmanager
 def ssh_remote(name, hostname, files, cmd):
@@ -286,6 +301,7 @@ def __init__(
         self.stdout = None
         self.stderr = None
         self.env = env
+        self.name = name
 
     def _rc(self, cmd):
         LOG.info("[{}] {}".format(self.hostname, cmd))
@@ -392,6 +408,14 @@ def wait_for_stdout_line(self, line, timeout):
             "{} not found in stdout after {} seconds".format(line, timeout)
         )
 
+    def print_result(self, line):
+        with open(os.path.join(self.root, "out"), "rb") as out:
+            lines = out.read().splitlines()
+            result = lines[-line:]
+            LOG.success(f"Result for {self.name}:")
+            for line in result:
+                LOG.debug(line.decode())
+
 
 CCF_TO_OE_LOG_LEVEL = {
     "trace": "VERBOSE",
@@ -582,6 +606,9 @@ def stop(self):
     def wait_for_stdout_line(self, line, timeout=5):
         return self.remote.wait_for_stdout_line(line, timeout)
 
+    def print_result(self, lines):
+        self.remote.print_result(lines)
+
     def set_recovery(self):
         self.remote.set_recovery()
 

tests/infra/remote_client.py

@@ -17,6 +17,7 @@
 class CCFRemoteClient(object):
     BIN = "cchost"
     DEPS = []
+    LINES_RESULT_FROM_END = 6
 
     def __init__(
         self,
@@ -60,7 +61,7 @@ def __init__(
         ] + command_args
 
         self.remote = remote_class(
-            name, host, [self.BIN] + self.DEPS, [], cmd, workspace, label
+            name, host, [self.BIN], self.DEPS, cmd, workspace, label
         )
 
     def setup(self):
@@ -104,3 +105,6 @@ def wait(self):
         except Exception:
             LOG.exception("Failed to wait on client {}".format(self.name))
             raise
+
+    def print_result(self):
+        self.remote.print_result(self.LINES_RESULT_FROM_END)

tests/infra/runner.py

@@ -130,6 +130,7 @@ def run(build_directory, get_command, args):
                     if not tx_rates.process_next():
                         for i, remote_client in enumerate(clients):
                             remote_client.wait()
+                            remote_client.print_result()
                             # TODO: For now, only retrieve perf csv for the first client
                             # as all files have the same name on all clients
                             remote_client.stop(i == 0)