Make PyAuto functional tests compatible with python 2.7

chrome/test/functional/pyauto_functional.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Setup for PyAuto functional tests.
 
 Use the following in your scripts to run them standalone:
 
 # This should be at the top
@@ skipping 48 matching lines @@
     elif sys.platform.startswith('linux'):
       cmd = ['python2.6']
 
     cmd.extend(sys.argv)
     print 'Running:', ' '.join(cmd)
     proc = subprocess.Popen(cmd)
     proc.wait()
     sys.exit(proc.returncode)
 
   # Check this is the right python version.
-  if sys.version_info[0:2] != (2, 6):
+  # Also check the environment variable DO_NOT_RESTART_PYTHON_FOR_PYAUTO. If
+  # it is set to TRUE (case-insensitive), then do not run RunAgain() regardless
+  # what current python version is.
+
+  if (sys.version_info[0:2] != (2, 6) and
+      (os.getenv('DO_NOT_RESTART_PYTHON_FOR_PYAUTO') is None or
+       os.getenv('DO_NOT_RESTART_PYTHON_FOR_PYAUTO').upper() != 'TRUE')):
     RunAgain()
 
   # Check this is the right bitness on mac.
   # platform.architecture() will not help us on mac, since multiple binaries
   # are stuffed inside the universal python binary.
   if sys.platform.startswith('darwin') and sys.maxint > 2**32:
     # User is running 64-bit python, but we should use 32-bit.
     RunAgain()
 
 
 RunWithCorrectPythonIfNecessary()

[dennis_jeffrey, 2012/07/04 01:04:18]

It might make more sense to add the check here.  We shouldn't even invoke this
function at all if the environment variable is set.

Additionally, maybe we can just check if the env variable exists (not None); no
need to force it to have value true.

[fdeng1, 2012/07/09 20:52:37]

I've moved the check here.
On 2012/07/04 01:04:18, dennis_jeffrey wrote:

 
 
 try:
   import pyauto
 except ImportError:
   print >>sys.stderr, 'Cannot import pyauto from %s' % sys.path
   raise
 
 
 class Main(pyauto.Main):
   """Main program for running PyAuto functional tests."""
 
   def __init__(self):
     # Make scripts in this dir importable
     sys.path.append(os.path.dirname(__file__))
     pyauto.Main.__init__(self)
 
   def TestsDir(self):
     return os.path.dirname(__file__)
 
 
 if __name__ == '__main__':
   Main()