fix coverage

tests/functional/simple_test.py

@@ -31,6 +31,7 @@ def test_second_install_faster(tmpdir):
 coverage
 pylint
 pytest
+wsgiref==0.1
 ''')
 
     from time import time
@@ -70,15 +71,17 @@ def test_arguments_version(capfd):
     assert lasterr == errname + ': [Errno 2] No such file or directory', err
 
     lines = out.split('\n')
-    assert lines[-3] == ('> virtualenv virtualenv_run --version'), out
+    assert lines[-4] == ('> virtualenv virtualenv_run --version'), out
+    assert lines[-2].startswith('> /'), out
+    assert lines[-2].endswith('/python venv_update.py --stage2 virtualenv_run requirements.txt --version')
 
 
 def test_arguments_system_packages(tmpdir, capfd):
     """Show that we can pass arguments through to virtualenv"""
     tmpdir.chdir()
     get_scenario('trivial')
 
-    venv_update('--system-site-packages')
+    venv_update('--system-site-packages', 'virtualenv_run', 'requirements.txt')
     out, err = capfd.readouterr()  # flush buffers
 
     run('virtualenv_run/bin/python', '-c', '''\

tests/functional/stage2_test.py

@@ -24,6 +24,10 @@ def test_trivial(tmpdir):
     tmpdir.chdir()
     get_scenario('trivial')
 
+    with open('requirements.txt', 'w') as requirements:
+        # An arbitrary small package: mccabe
+        requirements.write('mccabe\nwsgiref==0.1')
+
     run('virtualenv', 'myvenv')
     # need this to get coverage. surely there's a better way...
     run(

venv_update.py

@@ -58,10 +58,18 @@ def parseargs(args):
     return stage, virtualenv_dir, tuple(requirements), tuple(remaining)
 
 
+def timid_relpath(arg):
+    from os.path import exists, isabs, relpath
+    if isabs(arg) and exists(arg):
+        return relpath(arg)
+    else:
+        return arg
+
+
 def shellescape(args):
     # TODO: unit test
     from pipes import quote
-    return ' '.join(quote(arg) for arg in args)
+    return ' '.join(quote(timid_relpath(arg)) for arg in args)
 
 
 def colorize(cmd):
@@ -222,6 +230,13 @@ def mark_venv_invalid(venv_path, reqs):
         print()
 
 
+def dotpy(filename):
+    if filename.endswith('.pyc'):
+        return filename[:-1]
+    else:
+        return filename
+
+
 def venv_update(stage, venv_path, reqs, venv_args):
     from os.path import join, abspath
     venv_python = abspath(join(venv_path, 'bin', 'python'))
@@ -230,11 +245,7 @@ def venv_update(stage, venv_path, reqs, venv_args):
         # make a fresh venv at the right spot, and use it to perform stage 2
         clean_venv(venv_path, venv_args)
 
-        from os import execv
-        execv(
-            venv_python,
-            (venv_python, __file__, '--stage2', venv_path) + reqs + venv_args
-        )  # never returns
+        run((venv_python, dotpy(__file__), '--stage2', venv_path) + reqs + venv_args)
     elif stage == 2:
         import sys
         assert sys.executable == venv_python, "Executable not in venv: %s != %s" % (sys.executable, venv_python)