儲存庫 vbox 的更動 82951

時間撮記:

2020-2-1 下午02:00:04 (5 年 以前)

作者:

vboxsync

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

135955

訊息:

ValKit: Fixes for new pylint.

位置:

trunk/src/VBox/ValidationKit

檔案:

• testdriver/vboxtestvms.py (修改) (2 筆差異)
• tests/additions/tdAddBasic1.py (修改) (1 筆差異)
• tests/storage/tdStorageBenchmark1.py (修改) (2 筆差異)

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

@@ -331 +331 @@
                 self.acCpusSup = [1];
             elif self.aInfo is not None:
-                self.acCpusSup = [i for i in range(self.aInfo[g_iMinCpu], self.aInfo[g_iMaxCpu]) ];
+                self.acCpusSup = list(range(self.aInfo[g_iMinCpu], self.aInfo[g_iMaxCpu]));
             else:
                 self.acCpusSup = [1];
@@ -1076 +1076 @@
                 self.acCpusSup = [1];
             elif self.aInfo is not None:
-                self.acCpusSup = [i for i in range(self.aInfo[g_iMinCpu], self.aInfo[g_iMaxCpu]) ];
+                self.acCpusSup = list(range(self.aInfo[g_iMinCpu], self.aInfo[g_iMaxCpu]));
             else:
                 self.acCpusSup = [1];

trunk/src/VBox/ValidationKit/tests/additions/tdAddBasic1.py

@@ -322 +322 @@
 
     def testLinuxInstallAdditions(self, oSession, oTxsSession, oTestVm):
-        oSession = oSession;
-        oTestVm = oTestVm;
+        _ = oSession;
+        _ = oTestVm;
 
         fRc = False;

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -1281 +1281 @@
                     fRc = self.mountValidationKitIso(oExecVm);
                     if fRc:
-                        oGstDiskCfg = storagecfg.DiskCfg('linux', storagecfg.g_ksDiskCfgList, \
+                        oGstDiskCfg = storagecfg.DiskCfg('linux', storagecfg.g_ksDiskCfgList,
                                                          self.getGuestDisk(oSession, oTxsSession, eStorageController));
                         oStorCfgVm = storagecfg.StorageCfg(oExecVm, oGstDiskCfg);
@@ -1291 +1291 @@
                                 reporter.log('Prepared storage on %s try' % (iTry + 1,));
                                 break;
-                            else:
-                                iTry = iTry + 1;
-                                self.sleep(5);
+                            iTry = iTry + 1;
+                            self.sleep(5);
 
                         if sMountPoint is not None:
                             # 3 hours max (Benchmark and QED takes a lot of time)
-                            self.testBenchmark('linux', sIoTest, sMountPoint, oExecVm, dTestSet, \
-                                               cMsTimeout = 3 * 3600 * 1000);
+                            self.testBenchmark('linux', sIoTest, sMountPoint, oExecVm, dTestSet, cMsTimeout = 3 * 3600 * 1000);
                             self.cleanupStorage(oStorCfgVm);
                         else: