Changeset 83990 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 27, 2020 9:57:12 AM (5 years ago)

Author:

vboxsync

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

137557

Message:

Validation Kit/testdriver: Pylint.

File:

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

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

@@ -2034 +2034 @@
             reporter.log("  Monitors:           %s" % (oVM.graphicsAdapter.monitorCount,));
             reporter.log("  GraphicsController: %s"
-                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType',
+                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType',                                              # pylint: disable=not-callable
                                                            oVM.graphicsAdapter.graphicsControllerType),));
         else:
@@ -2040 +2040 @@
             reporter.log("  Monitors:           %s" % (oVM.monitorCount,));
             reporter.log("  GraphicsController: %s"
-                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsControllerType),));
-        reporter.log("  Chipset:            %s" % (self.oVBoxMgr.getEnumValueName('ChipsetType', oVM.chipsetType),));
-        reporter.log("  Firmware:           %s" % (self.oVBoxMgr.getEnumValueName('FirmwareType', oVM.firmwareType),));
+                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsControllerType),));              # pylint: disable=not-callable
+        reporter.log("  Chipset:            %s" % (self.oVBoxMgr.getEnumValueName('ChipsetType', oVM.chipsetType),));             # pylint: disable=not-callable
+        reporter.log("  Firmware:           %s" % (self.oVBoxMgr.getEnumValueName('FirmwareType', oVM.firmwareType),));           # pylint: disable=not-callable
         reporter.log("  HwVirtEx:           %s" % (oVM.getHWVirtExProperty(vboxcon.HWVirtExPropertyType_Enabled),));
         reporter.log("  VPID support:       %s" % (oVM.getHWVirtExProperty(vboxcon.HWVirtExPropertyType_VPID),));
@@ -2099 +2099 @@
             reporter.log("    %s %s bus: %s type: %s" % (oCtrl.name, oCtrl.controllerType, oCtrl.bus, oCtrl.controllerType,));
         reporter.log("    AudioController:  %s"
-                     % (self.oVBoxMgr.getEnumValueName('AudioControllerType', oVM.audioAdapter.audioController),));
+                     % (self.oVBoxMgr.getEnumValueName('AudioControllerType', oVM.audioAdapter.audioController),));               # pylint: disable=not-callable
         reporter.log("    AudioEnabled:     %s" % (oVM.audioAdapter.enabled,));
         reporter.log("    Host AudioDriver: %s"
-                     % (self.oVBoxMgr.getEnumValueName('AudioDriverType', oVM.audioAdapter.audioDriver),));
+                     % (self.oVBoxMgr.getEnumValueName('AudioDriverType', oVM.audioAdapter.audioDriver),));                       # pylint: disable=not-callable
 
         self.processPendingEvents();
@@ -2155 +2155 @@
                 continue;
             reporter.log("    slot #%d: type: %s (%s) MAC Address: %s lineSpeed: %s"
-                         % (iSlot, self.oVBoxMgr.getEnumValueName('NetworkAdapterType', oNic.adapterType),
+                         % (iSlot, self.oVBoxMgr.getEnumValueName('NetworkAdapterType', oNic.adapterType),                        # pylint: disable=not-callable
                             oNic.adapterType, oNic.MACAddress, oNic.lineSpeed) );
 
@@ -2197 +2197 @@
                 enmHostMode = oPort.hostMode;
                 reporter.log("    slot #%d: hostMode: %s (%s)  I/O port: %s  IRQ: %s  server: %s  path: %s" %
-                             (iSlot,  self.oVBoxMgr.getEnumValueName('PortMode', enmHostMode),
+                             (iSlot,  self.oVBoxMgr.getEnumValueName('PortMode', enmHostMode),                                    # pylint: disable=not-callable
                               enmHostMode, oPort.IOBase, oPort.IRQ, oPort.server, oPort.path,) );
                 self.processPendingEvents();
@@ -3510 +3510 @@
         if sFile is None:
             sFile = 'valkit.txt';
+
+        reporter.log2('txsCdWait: Waiting for file "%s" to become available ...' % (sFile,));
+
         fRemoveVm   = self.addTask(oSession);
         fRemoveTxs  = self.addTask(oTxsSession);
@@ -3639 +3642 @@
                 if fCdWait:
                     # Wait for CD?
+                    reporter.log2('startVmAndConnectToTxsViaTcp: Waiting for file "%s" to become available ...' % (sFileCdWait,));
                     fRc = self.txsCdWait(oSession, oTxsSession, cMsCdWait, sFileCdWait);
                     if fRc is not True: