Changeset 94510 in vbox

Timestamp:

Apr 7, 2022 12:08:20 PM (3 years ago)

Author:

vboxsync

Message:

Validation Kit/unit tests: Log expanded strings to easier find errors on the Validation Kit .ISO. ​bugref:10195

File:

• trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/tests/unittests/tdUnitTest1.py

@@ -795 +795 @@
         return iRc == 0;
 
+
+    def _logExpandString(self, sString, cVerbosity = 2):
+        """
+        Expands a given string by asking TxS on the guest side and logs it.
+        Uses log level 2 by default.
+
+        No-op if no TxS involved.
+        """
+        if reporter.getVerbosity() < cVerbosity \
+        or self.oTxsSession is None:
+            return;
+        sStringExp = self.txsExpandString(self.oSession, self.oTxsSession, sString);
+        if not sStringExp:
+            return;
+        reporter.log2('_logExpandString: "%s" -> "%s"' % (sString, sStringExp));
+
     def _wrapPathExists(self, sPath):
         """
@@ -804 +820 @@
         fRc = False;
         if self.sMode.startswith('remote'):
+            self._logExpandString(sPath);
             fRc = self.txsIsDir(self.oSession, self.oTxsSession, sPath, fIgnoreErrors = True);
             if not fRc:
@@ -839 +856 @@
         fRc = True;
         if self.sMode.startswith('remote'):
+            self._logExpandString(sSrc);
+            self._logExpandString(sDst);
             if self.sMode == 'remote-exec':
                 self.txsCopyFile(self.oSession, self.oTxsSession, sSrc, sDst, iMode);
@@ -947 +966 @@
                 asDirsToRemove.append(sDstDir);
 
-            sDst = os.path.join(sDstDir, os.path.basename(sFullPath));
+            sDst = os.path.join(sDstDir, os.path.basename(sFullPath) + self.sExeSuff);
             self._wrapCopyFile(sFullPath + self.sExeSuff, sDst, 0o755);
             asFilesToRemove.append(sDst);