Changeset 99698 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

May 9, 2023 12:25:48 PM (20 months ago)

Author:

vboxsync

Message:

Validation Kit/VBoxClient: Postpone checking for the display server until we reached the runlevel tests (otherwise a display server might not be running yet). bugref:10427

File:

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

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

@@ -586 +586 @@
                 reporter.testDone();
 
-        # Try to detect the display server running on the guest OS.
-        # This might fail on pure server guest OSes (no X, no Wayland).
-        if self.fpApiVer >= 7.1 and self.uRevision >= 157189:
-            sVBoxClient = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm, '/usr'), 'VBoxClient');
-            fRc = fRc and self.txsRunTest(oTxsSession, 'Check display server detection', 5 * 60 * 1000,
-                                          sVBoxClient, (sVBoxClient, '-v', '-v', '--session-detect'));
-
         return (fRc, oTxsSession);
 
@@ -598 +591 @@
         """
         Do run level tests.
+
+        Returns success status.
         """
 
@@ -612 +607 @@
 
         # Give the guest some time to build Guest Additions on system boot if needed.
-        return self.waitForGAs(oSession, cMsTimeout = 15 * 60 * 1000, aenmWaitForRunLevels = [ eExpectedRunLevel ]);
+        fRc = self.waitForGAs(oSession, cMsTimeout = 15 * 60 * 1000, aenmWaitForRunLevels = [ eExpectedRunLevel ]);
+
+        # Try to detect the display server running on the guest OS.
+        # This might fail on pure server guest OSes (no X, no Wayland).
+        if  fRc \
+        and oTestVm.isLinux():
+            if self.fpApiVer >= 7.1 and self.uRevision >= 157189:
+                sVBoxClient = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm, '/usr'), 'VBoxClient');
+                fRc = fRc and self.txsRunTest(oTxsSession, 'Check display server detection', 5 * 60 * 1000,
+                                              sVBoxClient, (sVBoxClient, '-v', '-v', '--session-detect'));
+        return fRc;
 
     def testIGuest_additionsVersion(self, oGuest):