tools: prepare tools/test.py for Python 3

PR-URL: #24799
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>

Author: cclauss

tools/test.py

@@ -50,6 +50,16 @@
 fromdatetimeimportdatetime
 fromQueueimportQueue, Empty
 
+try:
+reduce# Python 2
+exceptNameError: # Python 3
+fromfunctoolsimportreduce
+
+try:
+xrange# Python 2
+exceptNameError:
+xrange=range# Python 3
+
 logger=logging.getLogger('testrunner')
 skip_regex=re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)
 
@@ -110,9 +120,9 @@ def Run(self, tasks):
 forthreadinthreads:
 # Use a timeout so that signals (ctrl-c) will be processed.
 thread.join(timeout=10000000)
-except (KeyboardInterrupt, SystemExit),e:
+except (KeyboardInterrupt, SystemExit)ase:
 self.shutdown_event.set()
-exceptException,e:
+exceptExceptionase:
 # If there's an exception we schedule an interruption for any
 # remaining threads.
 self.shutdown_event.set()
@@ -149,7 +159,7 @@ def RunSingle(self, parallel, thread_id):
 output=case.Run()
 output.diagnostic.append('ECONNREFUSED received, test retried')
 case.duration= (datetime.now() -start)
-exceptIOError,e:
+exceptIOErrorase:
 return
 ifself.shutdown_event.is_set():
 return
@@ -600,7 +610,7 @@ def Win32SetErrorMode(mode):
 prev_error_mode=SEM_INVALID_VALUE
 try:
 importctypes
-prev_error_mode=ctypes.windll.kernel32.SetErrorMode(mode);
+prev_error_mode=ctypes.windll.kernel32.SetErrorMode(mode)
 exceptImportError:
 pass
 returnprev_error_mode
@@ -619,15 +629,15 @@ def KillTimedOutProcess(context, pid):
 defRunProcess(context, timeout, args, **rest):
 ifcontext.verbose: print("#", " ".join(args))
 popen_args=args
-prev_error_mode=SEM_INVALID_VALUE;
+prev_error_mode=SEM_INVALID_VALUE
 ifutils.IsWindows():
 ifcontext.suppress_dialogs:
 # Try to change the error mode to avoid dialogs on fatal errors. Don't
 # touch any existing error mode flags by merging the existing error mode.
 # See http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx.
-error_mode=SEM_NOGPFAULTERRORBOX;
-prev_error_mode=Win32SetErrorMode(error_mode);
-Win32SetErrorMode(error_mode|prev_error_mode);
+error_mode=SEM_NOGPFAULTERRORBOX
+prev_error_mode=Win32SetErrorMode(error_mode)
+Win32SetErrorMode(error_mode|prev_error_mode)
 
 faketty=rest.pop('faketty', False)
 pty_out=rest.pop('pty_out')
@@ -696,7 +706,7 @@ def CheckedUnlink(name):
 whileTrue:
 try:
 os.unlink(name)
-exceptOSError,e:
+exceptOSErrorase:
 # On Windows unlink() fails if another process (typically a virus scanner
 # or the indexing service) has the file open. Those processes keep a
 # file open for a short time only, so yield and try again; it'll succeed.
@@ -765,8 +775,8 @@ def disableCoreFiles():
 else:
 os.close(fd_out)
 os.close(fd_err)
-output=file(outname).read()
-errors=file(errname).read()
+output=open(outname).read()
+errors=open(errname).read()
 CheckedUnlink(outname)
 CheckedUnlink(errname)