topotest: reduce chattiness of lutil output

Signed-off-by: Lou Berger <lberger@labn.net>

diff --git a/tests/topotests/lib/lutil.py b/tests/topotests/lib/lutil.py
index 3ae18018bfdd84a10ff54ce82334ddc367458306..e58b4725eb6756b3425ee4570bdfd3ae037848cc 100755 (executable)
--- a/tests/topotests/lib/lutil.py
+++ b/tests/topotests/lib/lutil.py
@@ -37,7 +37,7 @@ class lUtil:
     base_log_dir = '.'
     fout_name = 'output.log'
     fsum_name = 'summary.txt'
-    l_level = 9
+    l_level = 6
     CallOnFail = False
 
     l_total = 0
@@ -53,12 +53,12 @@ class lUtil:
     fsum = ''
     net  = ''
 
-    def log(self, str):
+    def log(self, str, level=6):
         if self.l_level > 0:
             if self.fout == '':
                 self.fout = open(self.fout_name, 'w', 0)
             self.fout.write(str+'\n')
-        if self.l_level > 5:
+        if level <= self.l_level:
             print(str)
 
     def summary(self, str):
@@ -226,14 +226,16 @@ Total %-4d                                                           %-4d %d\n\
             ret = success
         else:
             ret = search.group()
-            self.log('found:%s:' % ret)
             if op != 'fail':
                 success = True
+                level = 7
             else:
                 success = False
+                level = 5
+            self.log('found:%s:' % ret, level)
            # Experiment: compare matched strings obtained each way
            if self.l_dotall_experiment and (group_nl_converted != ret):
-               self.log('DOTALL experiment: strings differ dotall=[%s] orig=[%s]' % (group_nl_converted, ret))
+               self.log('DOTALL experiment: strings differ dotall=[%s] orig=[%s]' % (group_nl_converted, ret), 9)
         if op == 'pass' or op == 'fail':
             self.result(target, success, result)
         if js != None:
@@ -265,7 +267,7 @@ LUtil=None
 
 #entry calls
 def luStart(baseScriptDir='.', baseLogDir='.', net='',
-            fout='output.log', fsum='summary.txt', level=9):
+            fout='output.log', fsum='summary.txt', level=None):
     global LUtil
     #init class
     LUtil=lUtil()
@@ -276,7 +278,8 @@ def luStart(baseScriptDir='.', baseLogDir='.', net='',
         LUtil.fout_name = baseLogDir + '/' + fout
     if fsum != None:
         LUtil.fsum_name = baseLogDir + '/' + fsum
-    LUtil.l_level = level
+    if level != None:
+        LUtil.l_level = level
     LUtil.l_dotall_experiment = False
     LUtil.l_dotall_experiment = True
 
@@ -289,11 +292,11 @@ def luCommand(target, command, regexp='.', op='none', result='', time=10, return
 def luLast(usenl=False):
     if usenl:
        if LUtil.l_last_nl != None:
-           LUtil.log('luLast:%s:' %  LUtil.l_last_nl.group())
+           LUtil.log('luLast:%s:' %  LUtil.l_last_nl.group(), 7)
        return LUtil.l_last_nl
     else:
        if LUtil.l_last != None:
-           LUtil.log('luLast:%s:' %  LUtil.l_last.group())
+           LUtil.log('luLast:%s:' %  LUtil.l_last.group(), 7)
        return LUtil.l_last
 
 def luInclude(filename, CallOnFail=None):