Index: utils/lit/lit/TestRunner.py =================================================================== --- utils/lit/lit/TestRunner.py +++ utils/lit/lit/TestRunner.py @@ -406,7 +406,7 @@ data = f.read() except: data = None - if data != None: + if data is not None: output_files.append((name, path, data)) results.append(ShellCommandResult( @@ -786,7 +786,7 @@ if exitCode == 0: status = Test.PASS else: - if timeoutInfo == None: + if timeoutInfo is None: status = Test.FAIL else: status = Test.TIMEOUT @@ -795,7 +795,7 @@ output = """Script:\n--\n%s\n--\nExit Code: %d\n""" % ( '\n'.join(script), exitCode) - if timeoutInfo != None: + if timeoutInfo is not None: output += """Timeout: %s\n""" % (timeoutInfo,) output += "\n" Index: utils/lit/lit/main.py =================================================================== --- utils/lit/lit/main.py +++ utils/lit/lit/main.py @@ -309,7 +309,7 @@ userParams[name] = val # Decide what the requested maximum indvidual test time should be - if opts.maxIndividualTestTime != None: + if opts.maxIndividualTestTime is not None: maxIndividualTestTime = opts.maxIndividualTestTime else: # Default is zero @@ -340,7 +340,7 @@ # After test discovery the configuration might have changed # the maxIndividualTestTime. If we explicitly set this on the # command line then override what was set in the test configuration - if opts.maxIndividualTestTime != None: + if opts.maxIndividualTestTime is not None: if opts.maxIndividualTestTime != litConfig.maxIndividualTestTime: litConfig.note(('The test suite configuration requested an individual' ' test timeout of {0} seconds but a timeout of {1} seconds was'