Changeset 83418 in vbox for trunk/src/VBox

Timestamp:

Mar 25, 2020 4:39:08 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/webui: The partial DB dump needs a user unique temporary file too.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• config.py (modified) (1 diff)
• webui/wuiadmin.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/config.py

@@ -90 +90 @@
 ## File on the build binary share that can be used to check that it's mounted.
 g_ksBuildBinRootFile    = 'builds.txt'
-## Template for paratial database dump files.  One argument: UID
-g_ksTmDbDumpFileTemplate = '/var/tmp/tm-partial-db-dump-for-%u.zip'
+## Template for paratial database dump output files.  One argument: UID
+g_ksTmDbDumpOutFileTmpl = '/var/tmp/tm-partial-db-dump-for-%u.zip'
+## Template for paratial database dump temporary files.  One argument: UID
+g_ksTmDbDumpTmpFileTmpl = '/var/tmp/tm-partial-db-dump-for-%u.pgtxt'
 ## @}
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py

@@ -483 +483 @@
         oFile    = None;
         oNow     = datetime.datetime.utcnow();
-        sTmpFile = config.g_ksTmDbDumpFileTemplate % (self._oCurUser.uid,);
+        sOutFile = config.g_ksTmDbDumpOutFileTmpl % (self._oCurUser.uid,);
+        sTmpFile = config.g_ksTmDbDumpTmpFileTmpl % (self._oCurUser.uid,);
         sScript  = os.path.join(config.g_ksTestManagerDir, 'db', 'partial-db-dump.py');
         try:
-            (iExitCode, sStdOut, sStdErr) = utils.processOutputUnchecked([sScript, '--days-to-dump', str(cDaysBack),
-                                                                          '-f', sTmpFile,]);
+            (iExitCode, sStdOut, sStdErr) = utils.processOutputUnchecked([ sScript,
+                                                                           '--days-to-dump', str(cDaysBack),
+                                                                           '-f', sOutFile,
+                                                                           '-t', sTmpFile,
+                                                                           ]);
             if iExitCode != 0:
                 raise Exception('iExitCode=%s\n--- stderr ---\n%s\n--- stdout ---\n%s' % (iExitCode, sStdOut, sStdErr,));
@@ -494 +498 @@
             # Open and send the dump.
             #
-            oFile = open(sTmpFile, 'rb');
+            oFile = open(sOutFile, 'rb');
             cbFile = os.fstat(oFile.fileno()).st_size;
 
@@ -513 +517 @@
                 try:    oFile.close();
                 except: pass;
+            utils.noxcptDeleteFile(sOutFile);
             utils.noxcptDeleteFile(sTmpFile);
         return self.ksDispatchRcAllDone;