Changeset 84316 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

May 15, 2020 7:55:00 AM (5 years ago)

Author:

vboxsync

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

137988

Message:

Validation Kit/testdriver: More diagnosis for txsCdWait().

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

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

@@ -3564 +3564 @@
             # Do some diagnosis to find out why this failed.
             ## @todo Identify guest OS type and only run one of the following commands.
+            fIsNotWindows = True;
             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.
-            sWinDir = "C:\\Windows\\System32\\";
-            oTxsSession.syncExec(sWinDir + " cmd.exe",
-                                 ('cmd.exe', '/C', 'dir', '${CDROM}'),
-                                 fIgnoreErrors = True);
-            oTxsSession.syncExec('C:\\WINNT\\System32\\cmd.exe',
-                                 ('C:\\WINNT\\System32\\cmd.exe', '/C', 'dir', '${CDROM}'),
-                                 fIgnoreErrors = True);
-
-            reporter.log('txsCdWait: Listing media directory:');
-            oTxsSession.syncExec('/bin/ls', ('/bin/ls', '-l', '-a', '-R', '/media'), fIgnoreErrors = True);
-            reporter.log('txsCdWait: Listing mount points / drives:');
-            oTxsSession.syncExec('/bin/mount', ('/bin/mount',), fIgnoreErrors = True);
-            oTxsSession.syncExec('/bin/cat', ('/bin/cat', '/etc/fstab'), fIgnoreErrors = True);
-            # Should work since WinXP Pro.
-            oTxsSession.syncExec(sWinDir + "wbem\\WMIC.exe",
-                                 ("WMIC.exe", "logicaldisk", "get",
-                                  "deviceid, volumename, description"),
-                                 fIgnoreErrors = True);
+            if fIsNotWindows:
+                oTxsSession.syncExec("/bin/ls", ("/bin/ls", "-al", "${CDROM}"), fIgnoreErrors = True);
+                reporter.log('txsCdWait: Listing media directory:');
+                oTxsSession.syncExec('/bin/ls', ('/bin/ls', '-l', '-a', '-R', '/media'), fIgnoreErrors = True);
+                reporter.log('txsCdWait: Listing mount points / drives:');
+                oTxsSession.syncExec('/bin/mount', ('/bin/mount',), fIgnoreErrors = True);
+                oTxsSession.syncExec('/bin/cat', ('/bin/cat', '/etc/fstab'), fIgnoreErrors = True);
+                oTxsSession.syncExec('/bin/dmesg', ('/bin/dmesg',), fIgnoreErrors = True);
+            else:
+                # ASSUMES that we always install Windows on drive C right now.
+                sWinDir = "C:\\Windows\\System32\\";
+                # Should work since WinXP Pro.
+                oTxsSession.syncExec(sWinDir + "wbem\\WMIC.exe",
+                                     ("WMIC.exe", "logicaldisk", "get",
+                                      "deviceid, volumename, description"),
+                                     fIgnoreErrors = True);
+                oTxsSession.syncExec(sWinDir + " cmd.exe",
+                                     ('cmd.exe', '/C', 'dir', '${CDROM}'),
+                                     fIgnoreErrors = True);
 
         if fRemoveTxs: