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

Timestamp:

Jun 11, 2019 12:44:53 AM (6 years ago)

Author:

vboxsync

Message:

ValKit: More work on mating unattended OS installation and GA testing. bugref:9151

File:

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

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

@@ -51 +51 @@
     """
 
-    def __init__(self, oTstDrv):
+    def __init__(self, oTstDrv, fUseAltFsPerfPathForWindows = False):
         base.SubTestDriverBase.__init__(self, oTstDrv, 'add-shared-folders', 'Shared Folders');
 
-        self.asTestsDef  = [ 'fsperf', ];
-        self.asTests     = self.asTestsDef;
-        self.asExtraArgs = [];
+        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;
 
     def parseOption(self, asArgs, iArg):
@@ -204 +207 @@
             asArgs.extend(self.asExtraArgs);
             reporter.log2('Starting guest FsPerf (%s)...' % (asArgs,));
-            fRc = self.oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 30 * 60 * 1000,
-                                          '${CDROM}/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}', 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.
+            fRc = self.oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 30 * 60 * 1000, sFsPerfPath, asArgs);
             reporter.log2('FsPerf -> %s' % (fRc,));