儲存庫 vbox 的更動 79445

時間撮記:

2019-7-1 下午03:44:12 (6 年 以前)

作者:

vboxsync

svn:sync-xref-src-repo-rev:

131701

訊息:

ValKit/reporter.py: Adjusted error count log prefix (iDebug > 1) and once again tried to make traceback more useful when logging exceptions. bugref:9151

檔案:

• trunk/src/VBox/ValidationKit/testdriver/reporter.py (修改) (3 筆差異)

trunk/src/VBox/ValidationKit/testdriver/reporter.py

@@ -499 +499 @@
         if iLevel <= self.iVerbose:
             # format it.
-            if self.iDebug > 0:
+            if self.iDebug <= 0:
+                sLogText = '%s %s' % (sTsPrf, sText);
+            elif self.iDebug <= 1:
                 sLogText = '%s %30s: %s' % (sTsPrf, sCaller, sText);
             else:
-                sLogText = '%s %s' % (sTsPrf, sText);
-            if self.iDebug > 1:
-                sLogText = 'err=%u %s' % (self.cErrors, sLogText,);
+                sLogText = '%s e=%u %30s: %s' % (sTsPrf, self.cErrors, sCaller, sText);
 
             # output it.
@@ -915 +915 @@
     def log(self, iLevel, sText, sCaller, sTsPrf):
         if iLevel <= self.iVerbose:
-            if self.iDebug > 0:
+            if self.iDebug <= 0:
+                sLogText = '%s %s' % (sTsPrf, sText);
+            elif self.iDebug <= 1:
                 sLogText = '%s %30s: %s' % (sTsPrf, sCaller, sText);
             else:
-                sLogText = '%s %s: %s' % (sTsPrf, self.sName, sText);
+                sLogText = '%s e=%u %30s: %s' % (sTsPrf, self.cErrors, sCaller, sText);
             self._writeOutput(sLogText);
         return 0;
@@ -1148 +1150 @@
                 try:
                     asInfo = formatExceptionOnly(oType, oValue, sCaller, sTsPrf);
+                    atEntries = traceback.extract_tb(oTraceback);
+                    atEntries.reverse();
                     if cFrames is not None and cFrames <= 1:
-                        asInfo = asInfo + traceback.format_tb(oTraceback, 1);
+                        if atEntries:
+                            asInfo = asInfo + traceback.format_list(atEntries[:1]);
                     else:
-                        asInfo.append('Traceback:')
-                        asInfo = asInfo + traceback.format_tb(oTraceback, cFrames);
+                        asInfo.append('Traceback (stack order):')
+                        if cFrames is not None and cFrames < len(atEntries):
+                            asInfo = asInfo + traceback.format_list(atEntries[:cFrames]);
+                        else:
+                            asInfo = asInfo + traceback.format_list(atEntries);
                         asInfo.append('Stack:')
                         asInfo = asInfo + traceback.format_stack(oTraceback.tb_frame.f_back, cFrames);