summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-08-18 15:15:06 -0400
committerGlenn Morris <rgm@gnu.org>2014-08-18 15:15:06 -0400
commitca8a1945a66fe301c41fd7b5b753d1da52655733 (patch)
tree6fb4ec8cfefde32dc99fd55acc09305820e6452a
parent5d3c0a067f8e070b6e5eb81ff4e4f6e1bb71be47 (diff)
downloademacs-ca8a1945a66fe301c41fd7b5b753d1da52655733.tar.gz
* python-tests.el (python-shell-calculate-exec-path-2): Update test
for today's python.el changes.
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/python-tests.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index d5c5e58f09c..90b30a4dd66 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-18 Glenn Morris <rgm@gnu.org>
+
+ * automated/python-tests.el (python-shell-calculate-exec-path-2):
+ Update test for today's python.el changes.
+
2014-08-11 Glenn Morris <rgm@gnu.org>
* automated/data/files-bug18141.el.gz: New file.
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index e1eaeea2c38..47dfa4b64ed 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -1753,7 +1753,7 @@ Using `python-shell-interpreter' and
"Test `python-shell-exec-path' modification."
(let* ((original-exec-path exec-path)
(python-shell-virtualenv-path
- (directory-file-name user-emacs-directory))
+ (directory-file-name (expand-file-name user-emacs-directory)))
(exec-path (python-shell-calculate-exec-path)))
(should (equal
exec-path