Changeset 96567 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Sep 1, 2022 3:39:51 PM (2 years ago)

Author:

vboxsync

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

153442

Message:

Validation Kit/testmanager/batch: Added maintain_archived_testsets.py batch job. Currently only supports deleting files within archived testset ZIPs and re-packing them, based on set criteria. See syntax help [pylint fixes]. bugref:8733

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/maintain_archived_testsets.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/maintain_archived_testsets.py

@@ -60 +60 @@
 from common                     import utils;
 from testmanager                import config;
-from testmanager.core.db        import TMDatabaseConnection;
-from testmanager.core.testset   import TestSetData, TestSetLogic;
-
 
 
@@ -82 +79 @@
         self.sTempDir       = oOptions.sTempDir;
         if not self.sTempDir:
-            self.sTempDir   = '/tmp'; ## @todo Make this more flexible.
+            self.sTempDir   = tempfile.gettempdir();
         #self.oTestSetLogic = TestSetLogic(TMDatabaseConnection(self.dprint if self.fVerbose else None));
         #self.oTestSetLogic = TestSetLogic(TMDatabaseConnection(None));
@@ -109 +106 @@
         """
 
+        _ = idTestSet
+
         sSrcZipFileAbs = os.path.join(sCurDir, sFile);
         print('Processing ZIP archive "%s" ...' % (sSrcZipFileAbs));
 
-        sDstZipFileAbs = os.path.join(self.sTempDir, next(tempfile._get_candidate_names()) + ".zip");
+        with tempfile.NamedTemporaryFile(dir=self.sTempDir, delete=False) as tmpfile:
+            sDstZipFileAbs = tmpfile.name
         self.dprint('Using temporary ZIP archive "%s"' % (sDstZipFileAbs));
 
@@ -190 +190 @@
                     return (None, 'Error opening "%s": %s' % (sSrcZipFileAbs, oXcpt1), None);
                 if not os.path.exists(sFile):
-                    return (None, 'File "%s" not found. [%s, %s]' % (sSrcZipFileAbs, sFile), None);
+                    return (None, 'File "%s" not found. [%s]' % (sSrcZipFileAbs, sFile), None);
                 return (None, 'Error opening "%s" inside "%s": %s' % (sSrcZipFileAbs, sFile, oXcpt1), None);
             except Exception as oXcpt2: