summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2014-09-23 16:20:43 +0200
committerholger krekel <holger@merlinux.eu>2014-09-23 16:20:43 +0200
commit5bd0130f9de902a71afb984a7bfee1921120ab32 (patch)
treed83acf50fe68a0b5179cca71e5183909a3fbbef2
parentdbb4723075fe76c0b61af8c0f733e0d75e555a60 (diff)
downloadtox-5bd0130f9de902a71afb984a7bfee1921120ab32.tar.gz
fix issue152: set VIRTUAL_ENV when running test commands,
thanks Florian Ludwig.
-rw-r--r--CHANGELOG2
-rw-r--r--tests/test_venv.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9e69564..d4dd250 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@
- fix issue148: remove "__PYVENV_LAUNCHER__" from os.environ when starting
subprocesses. Thanks Steven Myint.
+- fix issue152: set VIRTUAL_ENV when running test commands,
+ thanks Florian Ludwig.
1.7.2
diff --git a/tests/test_venv.py b/tests/test_venv.py
index 00e5f8b..fe2bed7 100644
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -513,6 +513,7 @@ def test_setenv_added_to_pcall(tmpdir, mocksession, newconfig):
assert env is not None
assert 'ENV_VAR' in env
assert env['ENV_VAR'] == 'value'
+ assert env['VIRTUAL_ENV'] == str(venv.path)
for e in os.environ:
assert e in env