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

Timestamp:

Apr 21, 2020 9:09:47 AM (5 years ago)

Author:

vboxsync

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

137408

Message:

Validation Kit/Guest Additions: More reboot fixes.

File:

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

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

@@ -63 +63 @@
     def __init__(self):
         vbox.TestDriver.__init__(self);
-        self.oTestVmSet = self.oTestVmManager.getSmokeVmSet('nat');
-        self.asTestsDef = ['install', 'guestprops', 'stdguestprops', 'guestcontrol', 'sharedfolders'];
-        self.asTests    = self.asTestsDef;
-        self.asRsrcs    = None
+        self.oTestVmSet  = self.oTestVmManager.getSmokeVmSet('nat');
+        self.asTestsDef  = ['install', 'guestprops', 'stdguestprops', 'guestcontrol', 'sharedfolders'];
+        self.asTests     = self.asTestsDef;
+        self.asRsrcs     = None
+        # The file we're going to use as a beacon to wait if the Guest Additions CD-ROM is ready.
+        self.sFileCdWait = '';
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
@@ -155 +157 @@
 
         if oTestVm.isWindows():
-            sFileCdWait = 'VBoxWindowsAdditions.exe';
+            self.sFileCdWait = 'VBoxWindowsAdditions.exe';
         elif oTestVm.isLinux():
-            sFileCdWait = 'VBoxLinuxAdditions.run';
+            self.sFileCdWait = 'VBoxLinuxAdditions.run';
 
         self.logVmInfo(oVM);
-        oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True, sFileCdWait = sFileCdWait);
+        oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True,
+                                                                  sFileCdWait = self.sFileCdWait);
         if oSession is not None:
             self.addTask(oTxsSession);
@@ -418 +421 @@
 
         if fRc:
-
             # Make sure the new, updated kernel is in charge, which eventually got installed by the updating stuff above.
             # Otherwise building the Guest Additions module might not work correctly.
-            reporter.log('Rebooting guest in order to get the latest kernel active ...');
-            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout);
+            reporter.testStart('Rebooting guest in order to get the latest kernel active ...');
+            (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout,
+                                                                  sFileCdWait = self.sFileCdWait);
             if fRc is True:
+                reporter.testDone();
 
                 #
@@ -448 +452 @@
                 # Do the final reboot to get the just installed Guest Additions up and running.
                 if fRc:
-                    (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout);
+                    reporter.testStart('Rebooting guest in order to get the updated Guest Additions active ...');
+                    (fRc, oTxsSession) = self.txsRebootAndReconnectViaTcp(oSession, oTxsSession, cMsTimeout,
+                                                                          sFileCdWait = self.sFileCdWait);
+                    if fRc:
+                        pass
+                    else:
+                        reporter.testFailure('Rebooting and reconnecting to TXS service failed');
+                    reporter.testDone();
+            else:
+                reporter.testFailure('Rebooting and reconnecting to TXS service failed');
+                reporter.testDone();
 
         return (fRc, oTxsSession);