Changeset 98655 in vbox for trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

Timestamp:

Feb 20, 2023 3:05:40 PM (2 years ago)

Author:

vboxsync

Message:

ValKit: Pylint 2.16.2 adjustments.

File:

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

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

@@ -526 +526 @@
         they don't throw errors.
         """
-        if True is True: # pylint: disable=comparison-with-itself
+        if True is True: # pylint: disable=comparison-with-itself,comparison-of-constants
             try:
                 iPct        = self.o.operationPercent;
@@ -1837 +1837 @@
                     reporter.errorXcpt('addStorageController("%s",%s) failed on "%s"' % (sController, eBus, self.sName) );
                     return False;
-                else:
-                    try:
-                        oCtl.controllerType = eType;
-                        reporter.log('added storage controller "%s" (bus %s, type %s) to %s'
-                                    % (sController, eBus, eType, self.sName));
-                    except:
-                        reporter.errorXcpt('controllerType = %s on ("%s" / %s) failed on "%s"'
-                                           % (eType, sController, eBus, self.sName) );
-                        return False;
+                try:
+                    oCtl.controllerType = eType;
+                    reporter.log('added storage controller "%s" (bus %s, type %s) to %s'
+                                % (sController, eBus, eType, self.sName));
+                except:
+                    reporter.errorXcpt('controllerType = %s on ("%s" / %s) failed on "%s"'
+                                       % (eType, sController, eBus, self.sName) );
+                    return False;
         finally:
             self.oTstDrv.processPendingEvents();
@@ -2474 +2473 @@
             sValue = self.o.machine.getExtraData(sKey)
         except:
-            reporter.errorXcpt('IMachine::setExtraData("%s","%s") failed' % (sKey, sValue))
+            reporter.errorXcpt('IMachine::getExtraData("%s") failed' % (sKey,))
             return None
         return sValue
@@ -3289 +3288 @@
                 self._deregisterEventHandler();
                 raise;
-            else:
-                if sIpAddr is not None:
-                    self._setIp(sIpAddr);
+            if sIpAddr is not None:
+                self._setIp(sIpAddr);
 
             #