Changeset 79452 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py

Timestamp:

Jul 1, 2019 4:49:51 PM (5 years ago)

Author:

vboxsync

Message:

ValKit/UnattendedInst1,++: Adjustments for ubuntu. bugref:9151

File:

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

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

@@ -51 +51 @@
     """
 
-    def __init__(self, oTstDrv, fUseAltFsPerfPathForWindows = False):
+    def __init__(self, oTstDrv):
         base.SubTestDriverBase.__init__(self, oTstDrv, 'add-shared-folders', 'Shared Folders');
 
-        self.asTestsDef                     = [ 'fsperf', ];
-        self.asTests                        = self.asTestsDef;
-        self.asExtraArgs                    = [];
-        self.sGstFsPerfPath                 = '${CDROM}/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}';
-        self.sGstFsPerfPathAlt              = 'C:/Apps/FsPerf${EXESUFF}';
-        self.fUseAltFsPerfPathForWindows    = fUseAltFsPerfPathForWindows;
+        self.asTestsDef         = [ 'fsperf', ];
+        self.asTests            = self.asTestsDef;
+        self.asExtraArgs        = [];
+        self.asGstFsPerfPaths   = [
+            '${CDROM}/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}',
+            '${CDROM}/${OS/ARCH}/FsPerf${EXESUFF}',
+            '${TXSDIR}/${OS/ARCH}/FsPerf${EXESUFF}',
+            '${TXSDIR}/FsPerf${EXESUFF}',
+            'E:/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}',
+        ];
 
     def parseOption(self, asArgs, iArg):
@@ -206 +210 @@
             # Add the extra arguments from the command line and kick it off:
             asArgs.extend(self.asExtraArgs);
+
+            # Run FsPerf:
             reporter.log2('Starting guest FsPerf (%s)...' % (asArgs,));
-            sFsPerfPath = self.sGstFsPerfPath;
-            if oTestVm.isWindows() and self.fUseAltFsPerfPathForWindows: # bird: Temp hack till we get UDF cloning implemented.
-                sFsPerfPath = self.sGstFsPerfPathAlt;                    #       Helps making unattended install tests work.
+            sFsPerfPath = self._locateGstFsPerf(oTxsSession);
             fRc = self.oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 30 * 60 * 1000, sFsPerfPath, asArgs);
             reporter.log2('FsPerf -> %s' % (fRc,));
@@ -225 +229 @@
 
 
+    def _locateGstFsPerf(self, oTxsSession):
+        """
+        Returns guest side path to FsPerf.
+        """
+        for sFsPerfPath in self.asGstFsPerfPaths:
+            if oTxsSession.syncIsFile(sFsPerfPath):
+                return sFsPerfPath;
+        reporter.log('Unable to find guest FsPerf in any of these places: %s' % ('\n    '.join(self.asGstFsPerfPaths),));
+        return self.asGstFsPerfPaths[0];
+
+
 
 if __name__ == '__main__':