commit 68f42e267043a9d706b94b576c8df75e23488dfe
author Allen Li <ayatane@chromium.org> Mon Mar 27 17:08:59 2017 -0700
committer Xixuan Wu <xixuan@chromium.org> Tue Mar 28 03:59:31 2017 +0000
tree 44ecbb579932b6d2d36af9a9f7e26001b53f6a19
parent edd35e79fb9c402844df7ee98192846e104549ec

Use versioned virtualenv for virtualenv_wrapper

BUG=chromium:703769
TEST=Run virtualenv’ed unittests

Change-Id: I84834ebca61b0caf7ae99c0cd8aa070ca2b32365
Reviewed-on: https://chromium-review.googlesource.com/461380
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
Commit-Queue: Allen Li <ayatane@chromium.org>
Trybot-Ready: Allen Li <ayatane@chromium.org>

scripts/virtualenv_wrapper.py

diff --git a/scripts/virtualenv_wrapper.py b/scripts/virtualenv_wrapper.py
index 67c7b17..b6bcae6 100755
--- a/scripts/virtualenv_wrapper.py
+++ b/scripts/virtualenv_wrapper.py
@@ -25,11 +25,7 @@
 
 # _VIRTUALENV_DIR contains the scripts for working with venvs
 _VIRTUALENV_DIR = os.path.join(_CHROMITE_DIR, '..', 'infra_virtualenv')
-_CREATE_VENV_PATH = os.path.join(_VIRTUALENV_DIR, 'create_venv')
-
-# _VENV_DIR is the virtualenv dir that contains bin/activate.
-_VENV_DIR = os.path.join(_CHROMITE_DIR, 'venv', '.venv')
-_VENV_PYTHON = os.path.join(_VENV_DIR, 'bin', 'python')
+_CREATE_VENV_PATH = os.path.join(_VIRTUALENV_DIR, 'bin', 'create_venv')
 _REQUIREMENTS = os.path.join(_CHROMITE_DIR, 'venv', 'requirements.txt')
 
 _VENV_MARKER = 'INSIDE_CHROMITE_VENV'
@@ -39,28 +35,29 @@
   if _IsInsideVenv(os.environ):
     wrapper.DoMain()
   else:
-    _CreateVenv()
-    _ExecInVenv(sys.argv)
+    venvdir = _CreateVenv()
+    _ExecInVenv(venvdir, sys.argv)
 
 
 def _CreateVenv():
   """Create or update chromite venv."""
-  subprocess.check_call([
+  return subprocess.check_output([
       _CREATE_VENV_PATH,
-      _VENV_DIR,
       _REQUIREMENTS,
-  ], stdout=sys.stderr)
+  ]).rstrip()
 
 
-def _ExecInVenv(args):
+def _ExecInVenv(venvdir, args):
   """Exec command in chromite venv.
 
   Args:
+    venvdir: virtualenv directory
     args: Sequence of arguments.
   """
+  venv_python = os.path.join(venvdir, 'bin', 'python')
   os.execve(
-      _VENV_PYTHON,
-      [_VENV_PYTHON] + list(args),
+      venv_python,
+      [venv_python] + list(args),
       _CreateVenvEnvironment(os.environ))