[Pytest-commit] commit/tox: magopian: fixes #87 : unset VIRTUALENV_PYTHON before calling virtualenv

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/7be299d36432/
Changeset:   7be299d36432
User:        magopian
Date:        2013-07-06 18:16:30
Summary:     fixes #87 : unset VIRTUALENV_PYTHON before calling virtualenv
Affected #:  2 files

diff -r d315272501bafb1a799fad80b2555002f9bd524d -r 7be299d36432aab33fd7f7ffc0ee5dfd5df6dbf8 tests/test_z_cmdline.py
--- a/tests/test_z_cmdline.py
+++ b/tests/test_z_cmdline.py
@@ -382,6 +382,15 @@
         "*create*",
     ])
 
+def test_env_VIRTUALENV_PYTHON(initproj, cmd, monkeypatch):
+    initproj("example123", filedefs={'tox.ini': ''})
+    monkeypatch.setenv("VIRTUALENV_PYTHON", '/FOO')
+    result = cmd.run("tox", "-v", "--notest")
+    assert not result.ret, result.stdout.lines
+    result.stdout.fnmatch_lines([
+        "*create*",
+    ])
+
 def test_sdistonly(initproj, cmd):
     initproj("example123", filedefs={'tox.ini': """
     """})

diff -r d315272501bafb1a799fad80b2555002f9bd524d -r 7be299d36432aab33fd7f7ffc0ee5dfd5df6dbf8 tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -301,6 +301,10 @@
 
     def _pcall(self, args, venv=True, cwd=None, extraenv={},
             action=None, redirect=True):
+        try:
+            del os.environ['VIRTUALENV_PYTHON']
+        except KeyError:
+            pass
         assert cwd
         cwd.ensure(dir=1)
         old = self.patchPATH()

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.