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

Timestamp:

Apr 14, 2023 9:47:19 AM (2 years ago)

Author:

vboxsync

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

156848

Message:

Validation Kit/tdAddGuestCtrl.py: Made cross testing (different VBox versions for host / guest) a bit more flexible by querying the installed Guest Additions version on runtime:

• Use a different coreutils path for old OL6 guests (see comments).
• Only do process execution CWD testing on guests with installed Guest Additions >= 7.1.

File:

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

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

@@ -1477 +1477 @@
         self.sPathVBoxServiceExeGst =   oTestVm.pathJoin(self.oTstDrv.getGuestSystemAdminDir(oTestVm), 'VBoxService') \
                                       + base.exeSuff();
+
+        # For some tests we need know the Guest Additions version, so fetch it now.
+        self.tpAdditionsVer         = self.oTstDrv.getGuestAdditionsVersion(oSession);
 
         reporter.log("Active tests: %s" % (self.asTests,));
@@ -3072 +3075 @@
                 sVBoxControl = "C:\\Program Files\\Oracle\\VirtualBox Guest Additions\\VBoxControl.exe";
         else:
-            sImageOut = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'ls');
+            # Really old guests (like OL 6) have their coreutils in /bin instead of /usr/bin.
+            if self.oTstDrv.txsIsFile(oSession, oTxsSession, "/bin/ls", fIgnoreErrors = True):
+                sImageOut = "/bin/ls";
+            else:
+                sImageOut = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'ls');
             if oTestVm.isLinux(): ## @todo check solaris and darwin.
                 sVBoxControl = "/usr/bin/VBoxControl"; # Symlink
@@ -3125 +3132 @@
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', 'stdouterr-non-existing' ]),
                   tdTestResultExec(fRc = True, iExitCode = 1) ],
-                # Current working directory set (VBox >= 7.1).
-                [ tdTestExec(sCmd = sImageOut, sCwd = sTempDir, asArgs = [ sImageOut, '/C', 'dir', '/S', sSystemDir ]),
-                  tdTestResultExec(fRc = True) ],
             ];
+
+            if self.oTstDrv.isVersionEqualOrBigger(self.tpAdditionsVer, "7.1.0"):
+                atExec.extend([
+                    # Current working directory set (VBox >= 7.1).
+                    [ tdTestExec(sCmd = sImageOut, sCwd = sTempDir, asArgs = [ sImageOut, '/C', 'dir', '/S', sSystemDir ]),
+                      tdTestResultExec(fRc = True) ]
+                ]);
+
             # atExec.extend([
                 # FIXME: Failing tests.
@@ -3177 +3189 @@
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, 'stdouterr-non-existing' ]),
                   tdTestResultExec(fRc = True, iExitCode = 2) ],
-                # Current working directory set (VBox >= 7.1).
-                [ tdTestExec(sCmd = sImageOut, sCwd = sTempDir, asArgs = [ sImageOut, '-R', sSystemDir ]),
-                  tdTestResultExec(fRc = True) ],
             ];
+
+            if self.oTstDrv.isVersionEqualOrBigger(self.tpAdditionsVer, "7.1.0"):
+                atExec.extend([
+                    # Current working directory set (VBox >= 7.1).
+                    [ tdTestExec(sCmd = sImageOut, sCwd = sTempDir, asArgs = [ sImageOut, '-R', sSystemDir ]),
+                      tdTestResultExec(fRc = True) ]
+                ]);
+
             # atExec.extend([
                 # FIXME: Failing tests.
@@ -3231 +3248 @@
                 sCmd   = sShell;
             else:
-                sCmd   = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'echo');
+                # Really old guests (like OL 6) have their coreutils in /bin instead of /usr/bin.
+                if self.oTstDrv.txsIsFile(oSession, oTxsSession, "/bin/echo", fIgnoreErrors = True):
+                    sCmd = "/bin/echo";
+                else:
+                    sCmd = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'echo');
 
             for _ in xrange(0, 16):
@@ -3899 +3920 @@
             fUseDirList = False;
             cEntriesPerRead = random.randrange(1, 32768);
-            if self.oTstDrv.fpApiVer >= 7.1 and self.oTstDrv.uRevision >= 156485:
+            if  self.oTstDrv.fpApiVer >= 7.1 and self.oTstDrv.uRevision >= 156485 \
+            and self.oTstDrv.isVersionEqualOrBigger(self.tpAdditionsVer, "7.1.0"):
                  # Listing directories only is available for >= VBox 7.1.
                 fUseDirList = random.choice( [True, False] );
@@ -3949 +3971 @@
                     fUseDirList = False;
                     cEntriesPerRead = random.randrange(1, 32768);
-                    if self.oTstDrv.fpApiVer >= 7.1 and self.oTstDrv.uRevision >= 156485:
+                    if  self.oTstDrv.fpApiVer >= 7.1 and self.oTstDrv.uRevision >= 156485 \
+                    and self.oTstDrv.isVersionEqualOrBigger(self.tpAdditionsVer, "7.1.0"):
                         # Listing directories only is available for >= VBox 7.1.
                         fUseDirList = random.choice( [True, False] );