Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5639)

Unified Diff: chrome/test/functional/pyauto_functional.py

Issue 10694077: Make PyAuto functional tests compatible with python 2.7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/functional/pyauto_functional.py
diff --git a/chrome/test/functional/pyauto_functional.py b/chrome/test/functional/pyauto_functional.py
index 1937a089e9559ab2502ad89271282f2943619d30..2fe5fb180370dadaad9bcb2700a04ed749f464cb 100755
--- a/chrome/test/functional/pyauto_functional.py
+++ b/chrome/test/functional/pyauto_functional.py
@@ -77,7 +77,13 @@ def RunWithCorrectPythonIfNecessary():
RunAgain()
-RunWithCorrectPythonIfNecessary()
+# Do not attempt to figure out python versions if
+# DO_NOT_RESTART_PYTHON_FOR_PYAUTO is set.
+if os.getenv('DO_NOT_RESTART_PYTHON_FOR_PYAUTO') is None:
+ RunWithCorrectPythonIfNecessary()
+else:
+ print 'Will not try to restart with the correct version of python '\
+ 'as DO_NOT_RESTART_PYTHON_FOR_PYAUTO is set.'
try:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698