[Emacs-diffs] master 19b92cd: Fix a test in python-test.el

[Tino Calancha]

branch: master
commit 19b92cdfb04a025037d7388954b64468d6f54462
Author: Tino Calancha <address@hidden>
Commit: Tino Calancha <address@hidden>

    Fix a test in python-test.el
    
    Fix a test that breaks the test suite when it is run within a
    virtual environment.
    See following link for details:
    https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00857.html
    * test/lisp/progmodes/python-tests.el
    (python-shell-calculate-process-environment-7): Bind
    python-shell-virtualenv-root to VIRTUAL_ENV when this var is set; otherwise
    bind it to '/env'.
---
 test/lisp/progmodes/python-tests.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/lisp/progmodes/python-tests.el 
b/test/lisp/progmodes/python-tests.el
index 2f4c2fb..3b75e81 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -2612,7 +2612,7 @@ Using `python-shell-interpreter' and
   "Test no side-effects on `process-environment'."
   (let* ((python-shell-process-environment
           '("TESTVAR1=value1" "TESTVAR2=value2"))
-         (python-shell-virtualenv-root "/env")
+         (python-shell-virtualenv-root (or (getenv "VIRTUAL_ENV") "/env"))
          (python-shell-unbuffered t)
          (python-shell-extra-pythonpaths'("/path1" "/path2"))
          (original-process-environment (copy-sequence process-environment)))