Changeset 65970 in vbox for trunk

Timestamp:

Mar 7, 2017 11:05:12 AM (8 years ago)

Author:

vboxsync

Message:

ValidationKit/testboxscript: pylint 2.0.0 fixes

Location:

trunk/src/VBox/ValidationKit/testboxscript

Files:

• testboxcommons.py (modified) (1 diff)
• testboxscript.py (modified) (2 diffs)
• testboxscript_real.py (modified) (2 diffs)
• testboxtasks.py (modified) (5 diffs)
• testboxupgrade.py (modified) (1 diff)

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

@@ -107 +107 @@
                 fnLogger1('internal-error: Hit exception #2! %s' % (traceback.format_exc()), sCaller, sTsPrf);
 
-            if len(asInfo) > 0:
+            if asInfo:
                 # Do the logging.
                 for sItem in asInfo:

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

@@ -89 +89 @@
         asArgs = sys.argv[1:];
         asArgs.insert(0, sRealScript);
-        if sys.executable is not None and len(sys.executable) > 0:
+        if sys.executable:
             asArgs.insert(0, sys.executable);
 
@@ -100 +100 @@
             if asArgs[i] == '--':
                 break;
-        if sPidFile is not None and len(sPidFile) > 0:
+        if sPidFile:
             oPidFile = open(sPidFile, 'w');
             oPidFile.write(str(os.getpid()));

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

@@ -233 +233 @@
         os.environ['TESTBOX_TIMEOUT_ABS']       = '0';
 
-        if utils.getHostOs() is 'win':
+        if utils.getHostOs() == 'win':
             os.environ['COMSPEC']            = os.path.join(os.environ['SystemRoot'], 'System32', 'cmd.exe');
         # Currently omitting any kBuild tools.
@@ -1009 +1009 @@
         for sPrefix in ['sBuilds', 'sTestRsrc']:
             sType = getattr(oOptions, sPrefix + 'ServerType');
-            if sType is None or len(sType.strip()) == 0:
+            if sType is None or not sType.strip():
                 setattr(oOptions, sPrefix + 'ServerType', None);
             elif sType not in ['cifs', 'nfs']:

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

@@ -195 +195 @@
 
         # If there is anything to flush, flush it.
-        if len(asBackLog) > 0:
+        if asBackLog:
             sBody = '';
             for sLine in asBackLog:
@@ -357 +357 @@
 
         if asArgs[0].endswith('.py') and fWithInterpreter:
-            if sys.executable is not None  and  len(sys.executable) > 0:
+            if sys.executable:
                 asArgs.insert(0, sys.executable);
             else:
@@ -380 +380 @@
 
             # EOF?
-            if len(sLine) == 0:
+            if not sLine:
                 break;
 
@@ -583 +583 @@
         # Tell the script to clean up.
         #
-        if len(self._sScriptCmdLine) > 0: # can be empty if cleanup crashed.
+        if self._sScriptCmdLine: # can be empty if cleanup crashed.
             (fRc, self._oChild) = self._spawnChild('cleanup-after');
             if fRc is True:
@@ -817 +817 @@
         for sArchive in asArchives:
             sArchive = sArchive.strip();
-            if len(sArchive) == 0:
+            if not sArchive:
                 continue;
 

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

@@ -124 +124 @@
     asArgs = [os.path.join(sUpgradeDir, 'testboxscript', 'testboxscript', 'testboxscript.py'), '--version' ];
     testboxcommons.log('Testing the new testbox script (%s)...' % (asArgs[0],));
-    if sys.executable is not None and len(sys.executable) > 0:
+    if sys.executable:
         asArgs.insert(0, sys.executable);
     oChild = subprocess.Popen(asArgs, shell = False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT);