Changeset 84112 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 30, 2020 3:48:14 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/testdriver: Debug logging for txsCdWait() for smoketest issues; follow-up to r137697.

File:

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

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

@@ -3514 +3514 @@
             sFile = 'valkit.txt';
 
+        reporter.log('txsCdWait: Waiting for file "%s" to become available ...' % (sFile,));
+
         fRemoveVm   = self.addTask(oSession);
         fRemoveTxs  = self.addTask(oTxsSession);
@@ -3522 +3524 @@
         if fRc is True:
             while True:
-                reporter.log('txsCdWait: Waiting for file "%s" to become available ...' % (sFile,));
                 # wait for it to complete.
                 oTask = self.waitForTasks(cMsTimeout2 + 1);
@@ -3549 +3550 @@
                 self.sleep(1);
 
-                ## @todo Make this optional and identify guest OS type.
-                reporter.log('txsCdWait: Listing root contents of ${CDROM}:');
-                oTxsSession.syncExec("/bin/ls", ("/bin/ls", "-al", "${CDROM}"), fIgnoreErrors = True);
-                # ASSUMES that we always install Windows on drive C right now.
-                # Does not run on ancient stuff which uses WINNT as %WinDir%.
-                oTxsSession.syncExec("C:\\Windows\\System32\\cmd.exe",
-                                     ("C:\\Windows\\System32\\cmd.exe", "/C", "dir", "${CDROM}"),
-                                     fIgnoreErrors = True);
-
-                # resubmitt the task.
+                # resubmit the task.
                 cMsTimeout2 = msStart + cMsTimeout - base.timestampMilli();
                 if cMsTimeout2 < 500:
@@ -3568 +3560 @@
         else:
             reporter.error('txsCdWait: asyncIsFile failed');
+
+        if not fRc:
+            ## @todo Identify guest OS type and only run one of the following commands.
+            reporter.log('txsCdWait: Listing root contents of ${CDROM}:');
+            oTxsSession.syncExec("/bin/ls", ("/bin/ls", "-al", "${CDROM}"), fIgnoreErrors = True);
+            # ASSUMES that we always install Windows on drive C right now.
+            oTxsSession.syncExec("C:\\Windows\\System32\\cmd.exe",
+                                 ("C:\\Windows\\System32\\cmd.exe", "/C", "dir", "${CDROM}"),
+                                 fIgnoreErrors = True);
+            oTxsSession.syncExec("C:\\WINNT\\System32\\cmd.exe",
+                                 ("C:\\WINNT\\System32\\cmd.exe", "/C", "dir", "${CDROM}"),
+                                 fIgnoreErrors = True);
 
         if fRemoveTxs: