Changeset 92893 in vbox

Timestamp:

Dec 14, 2021 9:22:24 AM (3 years ago)

Author:

vboxsync

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

148848

Message:

ValKit/testdriver/reporter.py: Get the right caller for maybeErr and maybeLog.

File:

• trunk/src/VBox/ValidationKit/testdriver/reporter.py (modified) (10 diffs)

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

@@ -1410 +1410 @@
 #
 
-def log(sText):
+def log(sText, sCaller = None):
     """Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(1, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(1, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1428 +1428 @@
     return logXcptWorker(1, False, "", sText, cFrames);
 
-def log2(sText):
+def log2(sText, sCaller = None):
     """Log level 2: Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(2, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(2, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1446 +1446 @@
     return logXcptWorker(2, False, "", sText, cFrames);
 
-def log3(sText):
+def log3(sText, sCaller = None):
     """Log level 3: Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(3, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(3, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1464 +1464 @@
     return logXcptWorker(3, False, "", sText, cFrames);
 
-def log4(sText):
+def log4(sText, sCaller = None):
     """Log level 4: Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(4, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(4, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1482 +1482 @@
     return logXcptWorker(4, False, "", sText, cFrames);
 
-def log5(sText):
+def log5(sText, sCaller = None):
     """Log level 2: Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(5, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(5, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1500 +1500 @@
     return logXcptWorker(5, False, "", sText, cFrames);
 
-def log6(sText):
+def log6(sText, sCaller = None):
     """Log level 6: Writes the specfied text to the log."""
     g_oLock.acquire();
     try:
-        rc = g_oReporter.log(6, sText, utils.getCallerName(), utils.getTimePrefix());
+        rc = g_oReporter.log(6, sText, sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         rc = -1;
@@ -1521 +1521 @@
     """ Maybe error or maybe normal log entry. """
     if fIsError is True:
-        return error(sText);
-    return log(sText);
+        return error(sText, sCaller = utils.getCallerName());
+    return log(sText, sCaller = utils.getCallerName());
 
 def maybeErrXcpt(fIsError, sText=None, cFrames=1):
@@ -1533 +1533 @@
     """ Maybe error or maybe normal log entry. """
     if fIsNotError is not True:
-        return error(sText);
-    return log(sText);
+        return error(sText, sCaller = utils.getCallerName());
+    return log(sText, sCaller = utils.getCallerName());
 
 def maybeLogXcpt(fIsNotError, sText=None, cFrames=1):
@@ -1542 +1542 @@
     return logXcpt(sText, cFrames);
 
-def error(sText):
+def error(sText, sCaller = None):
     """
     Writes the specfied error message to the log.
@@ -1554 +1554 @@
     try:
         g_oReporter.testIncErrors();
-        g_oReporter.log(0, '** error: %s' % (sText), utils.getCallerName(), utils.getTimePrefix());
+        g_oReporter.log(0, '** error: %s' % (sText), sCaller if sCaller else utils.getCallerName(), utils.getTimePrefix());
     except:
         pass;