Changeset 84963 in vbox

Timestamp:

Jun 25, 2020 7:26:43 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddBasic1.py: Re-introduced rebooting of Linux guests to (hopefully) get the CD detected there.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -175 +175 @@
         self.logVmInfo(oVM);
 
+        reporter.testStart('Waiting for TXS');
         if oTestVm.isWindows():
             self.sFileCdWait = ('%s/VBoxWindowsAdditions.exe' % (self.sGstPathGaPrefix,));
@@ -180 +181 @@
             self.sFileCdWait = ('%s/VBoxLinuxAdditions.run' % (self.sGstPathGaPrefix,));
 
-        reporter.log2('Waiting for TXS + CD: %s' % (self.sFileCdWait,));
-
-        reporter.testStart('Waiting for TXS + CD');
         oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True,
                                                                   cMsCdWait = 5 * 60 * 1000,
                                                                   sFileCdWait = self.sFileCdWait);
         reporter.testDone();
+
+        # Certain Linux guests don't behave accordingly so that detecting the CD isn't working properly.
+        # So reboot those guests in the hope that it works finally.
+        ### @todo Needs investigation; probably only udev or something is broken there (?).
+        if oTestVm.isLinux():
+            reporter.testStart('Rebooting and reconnecting to TXS');
+            fRc, oTxsSession = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, fCdWait = True,
+                                                                cMsCdWait = 5 * 60 * 1000,
+                                                                sFileCdWait = self.sFileCdWait);
+            reporter.testDone();
 
         if oSession is not None: