Index: /trunk/src/VBox/ValidationKit/testmanager/batch/add_build.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/add_build.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/add_build.py (revision 65978) @@ -87,5 +87,5 @@ if self.oConfig.asTargetOsArches is None: asMissing.append('--os-arch'); if self.oConfig.asFiles is None: asMissing.append('--file'); - if len(asMissing) > 0: + if asMissing: sys.stderr.write('syntax error: Missing: %s\n' % (asMissing,)); sys.exit(1); Index: /trunk/src/VBox/ValidationKit/testmanager/batch/check_for_deleted_builds.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/check_for_deleted_builds.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/check_for_deleted_builds.py (revision 65978) @@ -87,5 +87,5 @@ while True: aoBuilds = oBuildLogic.fetchForListing(iStart, cMaxRows, tsNow); - if not self.oConfig.fQuiet and len(aoBuilds) > 0: + if not self.oConfig.fQuiet and aoBuilds: print 'Processing builds #%s thru #%s' % (aoBuilds[0].idBuild, aoBuilds[-1].idBuild); Index: /trunk/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py (revision 65978) @@ -69,5 +69,5 @@ oLogic = TestSetLogic(oDb); aoOrphans = oLogic.fetchOrphaned(); - if len(aoOrphans) > 0: + if aoOrphans: # Complete them. if self.oConfig.fJustDoIt: Index: /trunk/src/VBox/ValidationKit/testmanager/batch/del_build.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/del_build.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/del_build.py (revision 65978) @@ -56,5 +56,5 @@ (oConfig, asArgs) = oParser.parse_args() - if len(asArgs) == 0: + if not asArgs: if not oConfig.fQuiet: sys.stderr.write('syntax error: No builds binaries specified\n'); Index: /trunk/src/VBox/ValidationKit/testmanager/batch/regen_sched_queues.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/regen_sched_queues.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/regen_sched_queues.py (revision 65978) @@ -83,5 +83,5 @@ print ' !!Hit exception processing "%s": %s' % (oGroup.sName, oXcpt,); else: - if len(aoErrors) == 0: + if not aoErrors: if not self.oConfig.fQuiet: print ' Successfully regenerated.'; @@ -94,5 +94,5 @@ else: print ' !!%s (%s)' % (oError[0], oError[1]); - if len(asMessages) > 0 and not self.oConfig.fQuiet: + if asMessages and not self.oConfig.fQuiet: print ' %d messages:' % (len(asMessages),); for sMsg in asMessages: Index: /trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py (revision 65978) @@ -79,5 +79,5 @@ if self.oConfig.sUrl is None: asMissing.append('--url'); if self.oConfig.sRepository is None: asMissing.append('--repository'); - if len(asMissing) > 0: + if asMissing: sys.stderr.write('syntax error: Missing: %s\n' % (asMissing,)); sys.exit(1); Index: /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py =================================================================== --- /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py (revision 65977) +++ /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py (revision 65978) @@ -181,5 +181,5 @@ Tries to reads the main log file since this will be the first source of information. """ - if len(self.sMainLog) > 0: + if self.sMainLog: return self.sMainLog; (oFile, oSizeOrError, _) = self.oTestSet.openFile('main.log', 'rb'); @@ -292,5 +292,5 @@ (self.oConfig, _) = oParser.parse_args(); - if self.oConfig.sLogFile is not None and len(self.oConfig.sLogFile) > 0: + if self.oConfig.sLogFile: self.oLogFile = open(self.oConfig.sLogFile, "a"); self.oLogFile.write('VirtualTestSheriff: $Revision$ \n'); @@ -510,5 +510,5 @@ # dCommentForResultId = oCaseFile.dCommentForResultId; - if len(oCaseFile.dReasonForResultId) > 0: + if oCaseFile.dReasonForResultId: # Must weed out ktHarmless. dReasonForResultId = {}; @@ -516,5 +516,5 @@ if tReason is not self.ktHarmless: dReasonForResultId[idKey] = tReason; - if len(dReasonForResultId) == 0: + if not dReasonForResultId: self.vprint(u'TODO: Closing %s without a real reason, only %s.' % (oCaseFile.sName, oCaseFile.dReasonForResultId)); @@ -532,5 +532,5 @@ if fSingleReason: dReasonForResultId = { oCaseFile.oTestSet.idTestResult: atValues[0], }; - if len(dCommentForResultId) > 0: + if dCommentForResultId: dCommentForResultId = { oCaseFile.oTestSet.idTestResult: dCommentForResultId.values()[0], }; elif oCaseFile.tReason is not None: @@ -588,5 +588,5 @@ if offEnd < 0: return iLine + 1 == len(asFollowingLines) and sStr.find(sLine, off) < 0; - if len(sLine) > 0 and sStr.find(sLine, off, offEnd) < 0: + if sLine and sStr.find(sLine, off, offEnd) < 0: return False; @@ -898,9 +898,9 @@ """ self.dprint('investigateLogSet: lengths: result log %u, VM log %u, kernel log %u, vga text %u, info text %u' - % ( len(sResultLog) if sResultLog is not None else 0, - len(sVMLog) if sVMLog is not None else 0, - len(sKrnlLog) if sKrnlLog is not None else 0, - len(sVgaText) if sVgaText is not None else 0, - len(sInfoText) if sInfoText is not None else 0, )); + % ( len(sResultLog if sResultLog else ''), + len(sVMLog if sVMLog else ''), + len(sKrnlLog if sKrnlLog else ''), + len(sVgaText if sVgaText else ''), + len(sInfoText if sInfoText else ''), )); #self.dprint(u'main.log<<<\n%s\n<<<\n' % (sResultLog,)); @@ -954,5 +954,5 @@ # Continue with vga text. - if sVgaText is not None and len(sVgaText) > 0: + if sVgaText: for fStopOnHit, tReason, sNeedle in self.katSimpleVgaTextReasons: if sVgaText.find(sNeedle) > 0: @@ -994,5 +994,5 @@ # info.txt. - if sInfoText is not None and len(sInfoText) > 0: + if sInfoText: for sNeedle, fnHandler in self.katInfoTextHandlers: if sInfoText.find(sNeedle) > 0: @@ -1174,5 +1174,5 @@ return self.caseClosed(oCaseFile); - if len(oCaseFile.dReasonForResultId) > 0: + if oCaseFile.dReasonForResultId: self.vprint(u'TODO: Got %u out of %u - close, but no cigar. :-/' % (len(oCaseFile.dReasonForResultId), len(aoFailedResults)));