Merge pull request #193 from Takishipp/signals

[simgrid.git] / tools / tesh / tesh.py

diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py
index be40773..f0c7da4 100755 (executable)
--- a/tools/tesh/tesh.py
+++ b/tools/tesh/tesh.py
@@ -23,17 +23,6 @@ under the terms of the license (GNU LGPL) which comes with this package.
 # then, even better:
 # ! expect (\1 > 500)
 
-# TODO: If the output is sorted, we should report it to the users. Corresponding perl chunk
-# print "WARNING: Both the observed output and expected output were sorted as requested.\n";
-# print "WARNING: Output were only sorted using the $sort_prefix first chars.\n"
-#    if ( $sort_prefix > 0 );
-# print "WARNING: Use <! output sort 19> to sort by simulated date and process ID only.\n";
-#
-# print "----8<---------------  Begin of unprocessed observed output (as it should appear in file):\n";
-# map {print "> $_\n"} @{$cmd{'unsorted got'}};
-# print "--------------->8----  End of the unprocessed observed output.\n";
-
-
 """
 
 
@@ -120,7 +109,7 @@ except NameError:
 
 # read file line per line (and concat line that ends with "\")
 class FileReader(Singleton):
-    def __init__(self, filename):
+    def __init__(self, filename=None):
         if filename is None:
             self.filename = "(stdin)"
             self.f = sys.stdin
@@ -129,15 +118,12 @@ class FileReader(Singleton):
             self.filename = os.path.basename(filename)
             self.abspath = os.path.abspath(filename)
             self.f = open(self.filename_raw)
-        
+
         self.linenumber = 0
 
-    def linenumber(self):
-        return self.linenumber
-    
     def __repr__(self):
         return self.filename+":"+str(self.linenumber)
-    
+
     def readfullline(self):
         try:
             line = next(self.f)
@@ -305,13 +291,13 @@ class Cmd(object):
 
         try:
             proc = subprocess.Popen(args, bufsize=1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
-        except OSError as e:
-            if e.errno == 8:
-                e.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)"
-            raise e
         except FileNotFoundError:
             print("["+FileReader().filename+":"+str(self.linenumber)+"] Cannot start '"+args[0]+"': File not found")
             exit(3)
+        except OSError as osE:
+            if osE.errno == 8:
+                osE.strerror += "\nOSError: [Errno 8] Executed scripts should start with shebang line (like #!/bin/sh)"
+            raise osE
 
         cmdName = FileReader().filename+":"+str(self.linenumber)
         try:
@@ -348,16 +334,16 @@ class Cmd(object):
                 self.output_pipe_stdout.sort(key=lambda x: x[:self.sort].lower())
             
             diff = list(difflib.unified_diff(self.output_pipe_stdout, stdouta,lineterm="",fromfile='expected', tofile='obtained'))
-            if len(diff) > 0: 
+            if len(diff) > 0:
                 print("Output of <"+cmdName+"> mismatch:")
                 if self.sort >= 0: # If sorted, truncate the diff output and show the unsorted version
                     difflen = 0;
                     for line in diff:
-                        if difflen<250:
+                        if difflen<50:
                             print(line)
                         difflen += 1
-                    if difflen > 100:
-                        print("(diff truncated after 250 lines)")
+                    if difflen > 50:
+                        print("(diff truncated after 50 lines)")
                     print("Unsorted observed output:\n")
                     for line in stdcpy:
                         print(line)