Changeset 94125 in vbox for trunk

Timestamp:

Mar 8, 2022 2:15:09 PM (3 years ago)

Author:

vboxsync

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

150374

Message:

ValKit/testboxscript: pylint 2.9.6 adjustments (mostly about using 'with' statements).

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• testboxcommand.py (modified) (3 diffs)
• testboxscript_real.py (modified) (5 diffs)
• testboxtasks.py (modified) (5 diffs)
• testboxupgrade.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testboxscript/testboxcommand.py

@@ -129 +129 @@
 
         # Kick off the task and ACK the command.
-        self._oCurTaskLock.acquire();
-        try:
+        with self._oCurTaskLock:
             self._oCurTask = TestBoxExecTask(self._oTestBoxScript, idResult = idResult, sScriptZips = sScriptZips,
                                              sScriptCmdLine = sScriptCmdLine, cSecTimeout = cSecTimeout);
-        finally:
-            self._oCurTaskLock.release();
         oConnection.sendAckAndClose(constants.tbresp.CMD_EXEC);
         return True;
@@ -327 +324 @@
             return (-1, '', False);
 
-        self._oCurTaskLock.acquire();
-        self._oCurTask = oTask;
-        self._oCurTaskLock.release();
+        with self._oCurTaskLock:
+            self._oCurTask = oTask;
 
         return (oTask.idTestBox, oTask.sTestBoxName, True);
@@ -351 +347 @@
     def _getCurTask(self):
         """ Gets the current task in a paranoidly safe manny. """
-        self._oCurTaskLock.acquire();
-        oCurTask = self._oCurTask;
-        self._oCurTaskLock.release();
+        with self._oCurTaskLock:
+            oCurTask = self._oCurTask;
         return oCurTask;
 

trunk/src/VBox/ValidationKit/testboxscript/testboxscript_real.py

@@ -182 +182 @@
             constants.tbreq.SIGNON_PARAM_SCRATCH_SIZE:     { self.VALUE: None,     self.FN: self._getFreeScratchSpace },
         }
-        for sItem in self._ddSignOnParams:
+        for sItem in self._ddSignOnParams:                      # pylint: disable=consider-using-dict-items
             if self._ddSignOnParams[sItem][self.FN] is not None:
                 self._ddSignOnParams[sItem][self.VALUE] = self._ddSignOnParams[sItem][self.FN]()
@@ -189 +189 @@
         testboxcommons.log('Test Manager URL: %s' % self._oOptions.sTestManagerUrl,)
         testboxcommons.log('Scratch root path: %s' % self._oOptions.sScratchRoot,)
-        for sItem in self._ddSignOnParams:
+        for sItem in self._ddSignOnParams:                      # pylint: disable=consider-using-dict-items
             testboxcommons.log('Sign-On value %18s: %s' % (sItem, self._ddSignOnParams[sItem][self.VALUE]));
 
@@ -323 +323 @@
             if sType == 'cifs':
                 ## @todo This stuff doesn't work on wei01-x4600b.de.oracle.com running 11.1. FIXME!
-                oPasswdFile = tempfile.TemporaryFile();
+                oPasswdFile = tempfile.TemporaryFile();     # pylint: disable=consider-using-with
                 oPasswdFile.write(sPassword + '\n');
                 oPasswdFile.flush();
@@ -795 +795 @@
         # Assemble SIGN-ON request parameters and send the request.
         dParams = {};
-        for sParam in self._ddSignOnParams:
+        for sParam in self._ddSignOnParams:                     # pylint: disable=consider-using-dict-items
             dParams[sParam] = self._ddSignOnParams[sParam][self.VALUE];
         oResponse = TestBoxConnection.sendSignOn(self._oOptions.sTestManagerUrl, dParams);
@@ -848 +848 @@
         # Refresh sign-on parameters, changes triggers sign-on.
         fNeedSignOn = not self._fSignedOn or self._fNeedReSignOn;
-        for item in self._ddSignOnParams:
-            if self._ddSignOnParams[item][self.FN] is None:
+        for sItem in self._ddSignOnParams:                      # pylint: disable=consider-using-dict-items
+            if self._ddSignOnParams[sItem][self.FN] is None:
                 continue
 
-            sOldValue = self._ddSignOnParams[item][self.VALUE]
-            self._ddSignOnParams[item][self.VALUE] = self._ddSignOnParams[item][self.FN]()
-            if sOldValue != self._ddSignOnParams[item][self.VALUE]:
+            sOldValue = self._ddSignOnParams[sItem][self.VALUE]
+            self._ddSignOnParams[sItem][self.VALUE] = self._ddSignOnParams[sItem][self.FN]()
+            if sOldValue != self._ddSignOnParams[sItem][self.VALUE]:
                 fNeedSignOn = True
-                testboxcommons.log('Detected %s parameter change: %s -> %s' %
-                                   (item, sOldValue, self._ddSignOnParams[item][self.VALUE]))
+                testboxcommons.log('Detected %s parameter change: %s -> %s'
+                                   % (sItem, sOldValue, self._ddSignOnParams[sItem][self.VALUE],))
 
         if fNeedSignOn:

trunk/src/VBox/ValidationKit/testboxscript/testboxtasks.py

@@ -184 +184 @@
         """
         fRc = True;
-        self._oBackLogFlushLock.acquire();
-
-        # Grab the current back log.
-        self._oBackLogLock.acquire();
-        asBackLog = self._asBackLog;
-        self._asBackLog  = [];
-        self._cchBackLog = 0;
-        self._secTsBackLogFlush = utils.timestampSecond();
-        self._oBackLogLock.release();
-
-        # If there is anything to flush, flush it.
-        if asBackLog:
-            sBody = '';
-            for sLine in asBackLog:
-                sBody += sLine + '\n';
-
-            oConnection = None;
-            try:
-                if oGivenConnection is None:
-                    oConnection = self._oTestBoxScript.openTestManagerConnection();
-                    oConnection.postRequest(constants.tbreq.LOG_MAIN, {constants.tbreq.LOG_PARAM_BODY: sBody});
-                    oConnection.close();
-                else:
-                    oGivenConnection.postRequest(constants.tbreq.LOG_MAIN, {constants.tbreq.LOG_PARAM_BODY: sBody});
-            except Exception as oXcpt:
-                testboxcommons.log('_logFlush error: %s' % (oXcpt,));
-                if len(sBody) < self.kcchMaxBackLog * 4:
-                    self._oBackLogLock.acquire();
-                    asBackLog.extend(self._asBackLog);
-                    self._asBackLog = asBackLog;
-                    # Don't restore _cchBackLog as there is no point in retrying immediately.
-                    self._oBackLogLock.release();
-                if oConnection is not None: # Be kind to apache.
-                    try:    oConnection.close();
-                    except: pass;
-                fRc = False;
-
-        self._oBackLogFlushLock.release();
+
+        with self._oBackLogFlushLock:
+            # Grab the current back log.
+            with self._oBackLogLock:
+                asBackLog = self._asBackLog;
+                self._asBackLog  = [];
+                self._cchBackLog = 0;
+                self._secTsBackLogFlush = utils.timestampSecond();
+
+            # If there is anything to flush, flush it.
+            if asBackLog:
+                sBody = '';
+                for sLine in asBackLog:
+                    sBody += sLine + '\n';
+
+                oConnection = None;
+                try:
+                    if oGivenConnection is None:
+                        oConnection = self._oTestBoxScript.openTestManagerConnection();
+                        oConnection.postRequest(constants.tbreq.LOG_MAIN, {constants.tbreq.LOG_PARAM_BODY: sBody});
+                        oConnection.close();
+                    else:
+                        oGivenConnection.postRequest(constants.tbreq.LOG_MAIN, {constants.tbreq.LOG_PARAM_BODY: sBody});
+                except Exception as oXcpt:
+                    testboxcommons.log('_logFlush error: %s' % (oXcpt,));
+                    if len(sBody) < self.kcchMaxBackLog * 4:
+                        with self._oBackLogLock:
+                            asBackLog.extend(self._asBackLog);
+                            self._asBackLog = asBackLog;
+                            # Don't restore _cchBackLog as there is no point in retrying immediately.
+                    if oConnection is not None: # Be kind to apache.
+                        try:    oConnection.close();
+                        except: pass;
+                    fRc = False;
+
         return fRc;
 
@@ -248 +245 @@
             sFullMsg = sMessage;
 
-        self._oBackLogLock.acquire();
-        self._asBackLog.append(sFullMsg);
-        cchBackLog = self._cchBackLog + len(sFullMsg) + 1;
-        self._cchBackLog = cchBackLog;
-        secTsBackLogFlush = self._secTsBackLogFlush;
-        self._oBackLogLock.release();
+        with self._oBackLogLock:
+            self._asBackLog.append(sFullMsg);
+            cchBackLog = self._cchBackLog + len(sFullMsg) + 1;
+            self._cchBackLog = cchBackLog;
+            secTsBackLogFlush = self._secTsBackLogFlush;
 
         testboxcommons.log(sFullMsg);
@@ -642 +638 @@
         """
         try:
-            oFile = open(sPath, "rb");
-            sStr = oFile.read();
+            with open(sPath, "rb") as oFile:
+                sStr = oFile.read();
             sStr = sStr.decode('utf-8');
-            oFile.close();
             return sStr.strip();
         except Exception as oXcpt:
@@ -662 +657 @@
         try:
             os.remove(sScriptCmdLine);
-            oFile = open(sScriptCmdLine, 'wb');
-            oFile.close();
+            open(sScriptCmdLine, 'wb').close();                 # pylint: disable=consider-using-with
         except Exception as oXcpt:
             self._log('Error truncating "%s": %s' % (sScriptCmdLine, oXcpt));
@@ -781 +775 @@
         """
         try:
-            oFile = open(sPath, "wb");
-            oFile.write(sContent.encode('utf-8'));
-            oFile.flush();
-            try:     os.fsync(oFile.fileno());
-            except:  pass;
-            oFile.close();
+            with open(sPath, "wb") as oFile:
+                oFile.write(sContent.encode('utf-8'));
+                oFile.flush();
+                try:     os.fsync(oFile.fileno());
+                except:  pass;
         except Exception as oXcpt:
             raise Exception('Failed to write "%s": %s' % (sPath, oXcpt));

trunk/src/VBox/ValidationKit/testboxscript/testboxupgrade.py

@@ -40 +40 @@
 
 # Validation Kit imports.
+from common        import utils;
 import testboxcommons
 from testboxscript import TBS_EXITCODE_SYNTAX;
-from common import utils;
 
 # Figure where we are.
@@ -127 +127 @@
     if sys.executable:
         asArgs.insert(0, sys.executable);
-    oChild = subprocess.Popen(asArgs, shell = False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT);
+    oChild = subprocess.Popen(asArgs, shell = False,                                        # pylint: disable=consider-using-with
+                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT);
 
     asBuf = []
@@ -300 +301 @@
     #       We'll remove them next time we upgrade.
     #
-    oZip = zipfile.ZipFile(sZipFile, 'r');
+    oZip = zipfile.ZipFile(sZipFile, 'r');                  # No 'with' support in 2.6 class: pylint: disable=consider-using-with
     asMembers = _doUpgradeCheckZip(oZip);
     if asMembers is None: