[tesh] write cmd output with 1 print()

This is to prevent printing collisions between threads.

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index 8972bbc..d62cd7f 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -322,10 +322,11 @@ class Cmd(object):
 
         self.args += TeshState().args_suffix
 
 
         self.args += TeshState().args_suffix
 

-        print("[" + FileReader().filename + ":" + str(self.linenumber) + "] " + self.args)
+        logs = list()
+        logs.append("[{file}:{number}] {args}".format(file=FileReader().filename,
+            number=self.linenumber, args=self.args))

 
         args = shlex.split(self.args)
 
         args = shlex.split(self.args)

-        #print (args)

 
         global running_pgids
         local_pgid = None
 
         global running_pgids
         local_pgid = None


@@ -351,21 +352,26 @@ class Cmd(object):
                 # os.getpgid failed. OK. No cleanup.
                 pass
         except PermissionError:
                 # os.getpgid failed. OK. No cleanup.
                 pass
         except PermissionError:

-            print("[" + FileReader().filename + ":" + str(self.linenumber) +
-                  "] Cannot start '" + args[0] + "': The binary is not executable.")
-            print("[" + FileReader().filename + ":" + str(self.linenumber) + "] Current dir: " + os.getcwd())
+            logs.append("[{file}:{number}] Cannot start '{cmd}': The binary is not executable.".format(
+                file=FileReader().filename, number=self.linenumber, cmd=args[0]))
+            logs.append("[{file}:{number}] Current dir: {dir}".format(file=FileReader().filename,
+                number=self.linenumber, dir=os.getcwd()))

             return_code = max(3, return_code)
             return_code = max(3, return_code)

+            print('\n'.join(logs))

             return
         except NotADirectoryError:
             return
         except NotADirectoryError:

-            print("[" + FileReader().filename + ":" + str(self.linenumber) + "] Cannot start '" +
-                  args[0] + "': The path to binary does not exist.")
-            print("[" + FileReader().filename + ":" + str(self.linenumber) + "] Current dir: " + os.getcwd())
+            logs.append("[{file}:{number}] Cannot start '{cmd}': The path to binary does not exist.".format(
+                file=FileReader().filename, number=self.linenumber, cmd=args[0]))
+            logs.append("[{file}:{number}] Current dir: {dir}".format(file=FileReader().filename,
+                number=self.linenumber, dir=os.getcwd()))

             return_code = max(3, return_code)
             return_code = max(3, return_code)

+            print('\n'.join(logs))

             return
         except FileNotFoundError:
             return
         except FileNotFoundError:

-            print("[" + FileReader().filename + ":" + str(self.linenumber) +
-                  "] Cannot start '" + args[0] + "': File not found")
+            logs.append("[{file}:{number}] Cannot start '{cmd}': File not found.".format(
+                file=FileReader().filename, number=self.linenumber, cmd=args[0]))

             return_code = max(3, return_code)
             return_code = max(3, return_code)

+            print('\n'.join(logs))

             return
         except OSError as osE:
             if osE.errno == 8:
             return
         except OSError as osE:
             if osE.errno == 8:


@@ -379,30 +385,29 @@ class Cmd(object):
             timeout_reached = False
         except subprocess.TimeoutExpired:
             timeout_reached = True
             timeout_reached = False
         except subprocess.TimeoutExpired:
             timeout_reached = True

-            print("Test suite `" + FileReader().filename + "': NOK (<" +
-                  cmdName + "> timeout after " + str(self.timeout) + " sec)")
+            logs.append("Test suite `{file}': NOK (<{cmd}> timeout after {timeout} sec)".format(
+                file=FileReader().filename, cmd=cmdName, timeout=self.timeout))

             running_pgids.remove(local_pgid)
             kill_process_group(local_pgid)
             # Try to get the output of the timeout process, to help in debugging.
             try:
                 (stdout_data, stderr_data) = proc.communicate(timeout=1)
             except subprocess.TimeoutExpired:
             running_pgids.remove(local_pgid)
             kill_process_group(local_pgid)
             # Try to get the output of the timeout process, to help in debugging.
             try:
                 (stdout_data, stderr_data) = proc.communicate(timeout=1)
             except subprocess.TimeoutExpired:

-                print("[{file}:{number}] Could not retrieve output. Killing the process group failed?".format(
+                logs.append("[{file}:{number}] Could not retrieve output. Killing the process group failed?".format(

                     file=FileReader().filename, number=self.linenumber))
                 return_code = max(3, return_code)
                     file=FileReader().filename, number=self.linenumber))
                 return_code = max(3, return_code)

+                print('\n'.join(logs))

                 return
 
         if self.output_display:
                 return
 
         if self.output_display:

-            print(stdout_data)
+            logs.append(str(stdout_data))

 
         # remove text colors
         ansi_escape = re.compile(r'\x1b[^m]*m')
         stdout_data = ansi_escape.sub('', stdout_data)
 
 
         # remove text colors
         ansi_escape = re.compile(r'\x1b[^m]*m')
         stdout_data = ansi_escape.sub('', stdout_data)
 

-        #print ((stdout_data, stderr_data))
-

         if self.ignore_output:
         if self.ignore_output:

-            print("(ignoring the output of <" + cmdName + "> as requested)")
+            logs.append("(ignoring the output of <{cmd}> as requested)".format(cmd=cmdName))

         else:
             stdouta = stdout_data.split("\n")
             while len(stdouta) > 0 and stdouta[-1] == "":
         else:
             stdouta = stdout_data.split("\n")
             while len(stdouta) > 0 and stdouta[-1] == "":


@@ -426,7 +431,7 @@ class Cmd(object):
                     fromfile='expected',
                     tofile='obtained'))
             if len(diff) > 0:
                     fromfile='expected',
                     tofile='obtained'))
             if len(diff) > 0:

-                print("Output of <" + cmdName + "> mismatch:")
+                logs.append("Output of <{cmd}> mismatch:".format(cmd=cmdName))

                 if self.sort >= 0:  # If sorted, truncate the diff output and show the unsorted version
                     difflen = 0
                     for line in diff:
                 if self.sort >= 0:  # If sorted, truncate the diff output and show the unsorted version
                     difflen = 0
                     for line in diff:


@@ -434,15 +439,16 @@ class Cmd(object):
                             print(line)
                         difflen += 1
                     if difflen > 50:
                             print(line)
                         difflen += 1
                     if difflen > 50:

-                        print("(diff truncated after 50 lines)")
-                    print("Unsorted observed output:\n")
+                        logs.append("(diff truncated after 50 lines)")
+                    logs.append("Unsorted observed output:\n")

                     for line in stdcpy:
                     for line in stdcpy:

-                        print(line)
+                        logs.append(line)

                 else:  # If not sorted, just display the diff
                     for line in diff:
                 else:  # If not sorted, just display the diff
                     for line in diff:

-                        print(line)
+                        logs.append(line)

 
 

-                print("Test suite `" + FileReader().filename + "': NOK (<" + cmdName + "> output mismatch)")
+                logs.append("Test suite `{file}': NOK (<{cmd}> output mismatch)".format(
+                    file=FileReader().filename, cmd=cmdName))

                 if lock is not None:
                     lock.release()
                 if TeshState().keep:
                 if lock is not None:
                     lock.release()
                 if TeshState().keep:


@@ -454,35 +460,40 @@ class Cmd(object):
                     for line in obtained:
                         f.write("> " + line + "\n")
                     f.close()
                     for line in obtained:
                         f.write("> " + line + "\n")
                     f.close()

-                    print("Obtained output kept as requested: " + os.path.abspath("obtained"))
+                    logs.append("Obtained output kept as requested: {path}".format(path=os.path.abspath("obtained")))

                 return_code = max(2, return_code)
                 return_code = max(2, return_code)

+                print('\n'.join(logs))

                 return
 
         if timeout_reached:
             return_code = max(3, return_code)
                 return
 
         if timeout_reached:
             return_code = max(3, return_code)

+            print('\n'.join(logs))

             return
 
             return
 

-        #print ((proc.returncode, self.expect_return))
-

         if proc.returncode != self.expect_return:
             if proc.returncode >= 0:
         if proc.returncode != self.expect_return:
             if proc.returncode >= 0:

-                print("Test suite `" + FileReader().filename + "': NOK (<" +
-                      cmdName + "> returned code " + str(proc.returncode) + ")")
+                logs.append("Test suite `{file}': NOK (<{cmd}> returned code {code})".format(
+                    file=FileReader().filename, cmd=cmdName, code=proc.returncode))

                 if lock is not None:
                     lock.release()
                 return_code = max(2, return_code)
                 if lock is not None:
                     lock.release()
                 return_code = max(2, return_code)

+                print('\n'.join(logs))

                 return
             else:
                 return
             else:

-                print("Test suite `" + FileReader().filename + "': NOK (<" + cmdName +
-                      "> got signal " + SIGNALS_TO_NAMES_DICT[-proc.returncode] + ")")
+                logs.append("Test suite `{file}': NOK (<{cmd}> got signal {sig})".format(
+                    file=FileReader().filename, cmd=cmdName,
+                    sig=SIGNALS_TO_NAMES_DICT[-proc.returncode]))

                 if lock is not None:
                     lock.release()
                 return_code = max(max(-proc.returncode, 1), return_code)
                 if lock is not None:
                     lock.release()
                 return_code = max(max(-proc.returncode, 1), return_code)

+                print('\n'.join(logs))

                 return
 
         if lock is not None:
             lock.release()
 
                 return
 
         if lock is not None:
             lock.release()
 

+        print('\n'.join(logs))
+

     def can_run(self):
         return self.args is not None
 
     def can_run(self):
         return self.args is not None