Changeset 91123 in vbox

Timestamp:

Sep 6, 2021 1:23:14 PM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: Try harder finding the su binary on the guest, might be different on some guests. Fall back to starting VKAT with the same privileges as TxS if not found. ​bugref:10008

File:

• trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/tests/audio/tdAudioTest.py

@@ -205 +205 @@
         return oTestVm.pathJoin(self.getGuestTempDir(oTestVm), 'vkat-guest.log');
 
-    def locateGstVkat(self, oSession, oTxsSession):
-        """
-        Returns guest side path to VKAT.
-        """
-        for sVkatPath in self.asGstVkatPaths:
-            reporter.log2('Checking for VKAT at: %s ...' % (sVkatPath));
-            if self.txsIsFile(oSession, oTxsSession, sVkatPath, fIgnoreErrors = True):
-                return (True, sVkatPath);
-        reporter.error('Unable to find guest VKAT in any of these places:\n%s' % ('\n'.join(self.asGstVkatPaths),));
+    def locateGstBinary(self, oSession, oTxsSession, asPaths):
+        """
+        Locates a guest binary on the guest by checking the paths in \a asPaths.
+        """
+        for sCurPath in asPaths:
+            reporter.log2('Checking for \"%s\" ...' % (sCurPath));
+            if self.txsIsFile(oSession, oTxsSession, sCurPath, fIgnoreErrors = True):
+                return (True, sCurPath);
+        reporter.error('Unable to find guest binary in any of these places:\n%s' % ('\n'.join(asPaths),));
         return (False, "");
 
@@ -409 +409 @@
         reporter.log('Guest audio test tag is \"%s\"' % (sTag));
 
-        fRc, sVkatExe = self.locateGstVkat(oSession, oTxsSession);
+        fRc, sVkatExe = self.locateGstBinary(oSession, oTxsSession, self.asGstVkatPaths);
         if fRc:
             reporter.log('Using VKAT on guest at \"%s\"' % (sVkatExe));
 
+            sCmd   = '';
             asArgs = [];
 
@@ -435 +436 @@
                 # as the Test Execution Service (TxS) currently does not implement impersonation yet.
                 #
-                sCmd     = '/usr/bin/su';
-                sCmdArgs = '';
-                for sArg in asArgs:
-                    sCmdArgs += sArg + " ";
-                asArgs   = [ sCmd, 'vbox', '-c', sCmdArgs ];
-            else: # Just start it with the same privileges as TxS.
-                sCmd     = sVkatExe;
+                asSU         = [ '/bin/su',
+                                 '/usr/bin/su',
+                                 '/usr/local/bin/su' ];
+                fRc, sCmd    = self.locateGstBinary(oSession, oTxsSession, asSU);
+                if fRc:
+                    sCmdArgs = '';
+                    for sArg in asArgs:
+                        sCmdArgs += sArg + " ";
+                    asArgs   = [ sCmd, 'vbox', '-c', sCmdArgs ];
+                else:
+                    reporter.log('Unable to find SU on guest, falling back to regular starting ...')
+
+            if not sCmd: # Just start it with the same privileges as TxS.
+                sCmd = sVkatExe;
 
             reporter.log2('startVkatOnGuest: sCmd=%s' % (sCmd,));