Changeset 77470 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Feb 26, 2019 3:47:23 PM (6 years ago)

Author:

vboxsync

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

129053

Message:

Validation Kit/testdriver: Fixed downloading guest files via txsService -- do the temporary file truncation before the download, not after.

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -30 +30 @@
 __version__ = "$Revision$"
 
+# pylint: disable=unnecessary-semicolon
 
 # Standard Python imports.
@@ -3292 +3293 @@
         fRc = True;
         for sGstFile in asFiles:
+            # First try to remove (unlink) an existing temporary file, as we don't truncate the file.
+            try:    os.unlink(sTmpFile);
+            except: pass;
             ## @todo Check for already existing files on the host and create a new
             #        name for the current file to download.
@@ -3297 +3301 @@
             reporter.log2('Downloading file "%s" to "%s" ...' % (sGstFile, sTmpFile));
             fRc = self.txsDownloadFile(oSession, oTxsSession, sGstFile, sTmpFile, 30 * 1000, fIgnoreErrors);
-            try:    os.unlink(sTmpFile);
-            except: pass;
             if fRc:
                 reporter.addLogFile(sTmpFile, 'misc/other', 'guest - ' + sGstFile);
@@ -3822 +3824 @@
             sRet = None;
         return sRet;
-