Changeset 99170 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2023 9:57:55 AM (22 months ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Log task function callback names for easier debugging.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (2 diffs)

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

@@ -3751 +3751 @@
         fRemoveTxs = self.addTask(oTxsSession);
 
+        reporter.log2('txsDoTask(%s): Running' % (str(fnAsync)));
         rc = fnAsync(*aArgs); # pylint: disable=star-args
         if rc is True:
@@ -3759 +3760 @@
                     rc = oTxsSession.getResult();
                 elif fIgnoreErrors is True:
-                    reporter.log(  'txsDoTask: task failed (%s)' % (oTxsSession.getLastReply()[1],));
+                    reporter.log(  'txsDoTask(%s): task failed (%s)' % (str(fnAsync), oTxsSession.getLastReply()[1],));
                 else:
-                    reporter.error('txsDoTask: task failed (%s)' % (oTxsSession.getLastReply()[1],));
+                    reporter.error('txsDoTask(%s): task failed (%s)' % (str(fnAsync), oTxsSession.getLastReply()[1],));
             else:
                 oTxsSession.cancelTask();
                 if oTask is None:
                     if fIgnoreErrors is True:
-                        reporter.log(  'txsDoTask: The task timed out.');
+                        reporter.log(  'txsDoTask(%s): The task timed out.' % (str(fnAsync)));
                     else:
-                        reporter.errorTimeout('txsDoTask: The task timed out.');
+                        reporter.errorTimeout('txsDoTask(%s): The task timed out.' % (str(fnAsync)));
                 elif oTask is oSession:
-                    reporter.error('txsDoTask: The VM terminated unexpectedly');
+                    reporter.error('txsDoTask(%s): The VM terminated unexpectedly' % (str(fnAsync)));
                 else:
                     if fIgnoreErrors is True:
-                        reporter.log(  'txsDoTask: An unknown task %s was returned' % (oTask,));
+                        reporter.log(  'txsDoTask(%s): An unknown task %s was returned' % (str(fnAsync), oTask,));
                     else:
-                        reporter.error('txsDoTask: An unknown task %s was returned' % (oTask,));
+                        reporter.error('txsDoTask(%s): An unknown task %s was returned' % (str(fnAsync), oTask,));
         else:
-            reporter.error('txsDoTask: fnAsync returned %s' % (rc,));
+            reporter.error('txsDoTask(%s) returned %s' % (str(fnAsync), rc,));
 
         if fRemoveTxs: