Validation Kit/VBoxClient: Always test for detecting the display server using "--session-detect" in VBoxClient (not only when skipping guest reboot). bugref:10427

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99672 cfe28804-0f27-0410-a406-dd0f0b0b656f

1 files changed, 8 insertions, 6 deletions

diff --git a/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py b/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
index fbc10f38adb..4f82fdfb5e3 100755
--- a/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
+++ b/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py
@@ -575,12 +575,7 @@ class tdAddBasic1(vbox.TestDriver):                                         # py
                                           (self.getGuestSystemShell(oTestVm),
                                           '/sbin/rcvboxadd', 'status-user'));
                     if fRc and oTxsSession.isSuccess():
-                        # 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 = self.txsRunTest(oTxsSession, 'Check display server detection', 5 * 60 * 1000,
-                                                  sVBoxClient, (sVBoxClient, '--session-detect'));
+                        pass;
                     else:
                         fRc = False;
                         reporter.testFailure('User services were not reloaded');
@@ -590,6 +585,13 @@ class tdAddBasic1(vbox.TestDriver):                                         # py
             if fRc:
                 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, '--session-detect'));
+
         return (fRc, oTxsSession);
 
     def testIGuest_additionsRunLevel(self, oSession, oTestVm, oGuest):