Changeset 93140 in vbox for trunk/src/VBox

Timestamp:

Jan 7, 2022 3:57:25 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: Handle guest session closing on guest reboot more gracefully (and log so if it failed).

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (3 diffs)

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

@@ -3238 +3238 @@
         oCreds.applyDefaultsIfNotSet(oTestVm);
 
+        fRebooted = False;
         fRc = True;
 
@@ -3301 +3302 @@
                         (oSession, oTxsSession) = self.oTstDrv.txsRebootAndReconnectViaTcp(oSession, oTxsSession,
                                                                                            cMsTimeout = 3 * 60000);
-                        if not oSession or not oTxsSession:
+                        if  oSession \
+                        and oTxsSession:
+                            # Set reboot flag (needed later for session closing).
+                            fRebooted = True;
+                        else:
+                            reporter.error('Rebooting via TXS failed');
                             try:    oGuestProcess.terminate();
                             except: reporter.logXcpt();
@@ -3336 +3342 @@
             oGuestSession.close();
         except:
-            fRc = reporter.errorXcpt();
+            # Closing the guest session will fail when the guest reboot has been triggered,
+            # as the session object will be cleared on a guest reboot.
+            if fRebooted:
+                reporter.logXcpt('Closing guest session failed, good (guest rebooted)');
+            else: # ... otherwise this (still) should succeed. Report so if it doesn't.
+                reporter.errorXcpt('Closing guest session failed');
 
         return (fRc, oTxsSession);