Merge branch 'test-output'

Author: tkf

.travis.yml

@@ -35,4 +35,4 @@ before_install:
  # but to separate installation phase and testing phase:
  - make deps
 script:
- - make test
+ - make travis-ci

Makefile

@@ -7,7 +7,7 @@ ELPA_DIR = \
 .cask/$(shell ${EMACS} -Q --batch --eval '(princ emacs-version)')/elpa
 # See: cask-elpa-dir
 
-.PHONY: test deps clean purge
+.PHONY: test deps clean purge travis-ci
 
 test: deps
 ${EMACS_TEST} --batch -f ert-run-tests-batch-and-exit
@@ -26,3 +26,6 @@ clean:
 
 purge: clean
 rm -rf ${ELPA_DIR}
+
+travis-ci: test
+test ! -d ~/.emacs.d/.python-environments

python-environment.el

@@ -62,21 +62,23 @@ Thus, typically the default virtual environment path is
  (lambda (msg output)
  (message "%s...Done" msg)
  (when python-environment--verbose
- (princ output)))
+ (message output)))
  msg))))
 
 (defun python-environment--blocking-process (msg command)
  (message "%s (SYNC)..." msg)
- (let ((exit-code
- (if python-environment--verbose
- (with-temp-buffer
- (apply #'call-process (car command)
- nil ; INFILE (no input)
- t ; BUFFER (output to this buffer)
- nil ; DISPLAY (no refresh is needed)
- (cdr command))
- (princ (buffer-string)))
- (apply #'call-process (car command) nil nil nil (cdr command)))))
+ (let (exit-code output)
+ (with-temp-buffer
+ (setq exit-code
+ (apply #'call-process (car command)
+ nil ; INFILE (no input)
+ t ; BUFFER (output to this buffer)
+ nil ; DISPLAY (no refresh is needed)
+ (cdr command)))
+ (setq output (buffer-string)))
+ (when (or python-environment--verbose
+ (not (= exit-code 0)))
+ (message output))
  (message "%s (SYNC)...Done" msg)
  (unless (= exit-code 0)
  (error "Command %S exits with error code %S." command exit-code))))

test-python-environment.el

@@ -34,13 +34,13 @@
  (indent 0))
  (let ((path (make-symbol "path")))
  `(let* ((,path (make-temp-file "pye-test-" t))
- (python-environment-root ,path))
+ (python-environment-directory ,path))
  (unwind-protect
  (progn ,@body)
  (delete-directory ,path t)))))
 
 (defmacro pye-deftest (name args &rest body)
- "Customized `ert-deftest'. Bind `python-environment-root' to a
+ "Customized `ert-deftest'. Bind `python-environment-directory' to a
 temporary directory while executing BODY."
  (declare (debug (&define :name test
  name sexp [&optional stringp]
@@ -83,6 +83,95 @@ variable can be given as ENVIRONMENT (see `pye-with-mixed-environment')."
  (error "Subprocess terminated with code %S.\nOutput:\n%s"
  code (buffer-string)))))))))
 
+(defmacro pye-test-with-capture-message (&rest form)
+ (declare (debug (&rest form))
+ (indent 0))
+ `(let ((start (make-marker))
+ (message-buffer (get-buffer "*Messages*")))
+ (with-current-buffer message-buffer
+ (set-marker start (point-max)))
+ (progn ,@form)
+ (with-current-buffer message-buffer
+ (buffer-substring start (point-max)))))
+
+(ert-deftest pye-test-test-with-capture-message ()
+ (should (equal (pye-test-with-capture-message
+ (message "test-1")
+ (message "test-2"))
+ "test-1\ntest-2\n")))
+
+(defun pye-test-proc-runner-output-message (proc-runner desired-output)
+ (let* ((command '("echo" "DUMMY-ECHO-MESSAGE"))
+ (python-environment--verbose t)
+ (message-output
+ (pye-test-with-capture-message
+ (funcall proc-runner "DUMMY-MESSAGE" command))))
+ (should (equal message-output desired-output))))
+
+(ert-deftest pye-test-deferred-process-output-message ()
+ (pye-test-proc-runner-output-message
+ (lambda (msg command)
+ (deferred:sync! (python-environment--deferred-process msg command))) "\
+DUMMY-MESSAGE...Done
+DUMMY-ECHO-MESSAGE
+
+"))
+
+(ert-deftest pye-test-blocking-process-output-message ()
+ (pye-test-proc-runner-output-message
+ #'python-environment--blocking-process "\
+DUMMY-MESSAGE (SYNC)...
+DUMMY-ECHO-MESSAGE
+
+DUMMY-MESSAGE (SYNC)...Done
+"))
+
+(defun pye-test-deferred-process-should-error ()
+ (let (err)
+ (deferred:sync!
+ (deferred:error
+ (python-environment--deferred-process
+ "DUMMY-MESSAGE"
+ '("false"))
+ (lambda (got) (setq err got))))
+ (should err)))
+
+(ert-deftest pye-test-deferred-process-error-without-verbose ()
+ (let ((python-environment--verbose nil))
+ (pye-test-deferred-process-should-error)))
+
+(ert-deftest pye-test-deferred-process-noerror-without-verbose ()
+ (let ((python-environment--verbose nil))
+ (deferred:sync!
+ (python-environment--deferred-process "DUMMY-MESSAGE" '("true")))))
+
+(ert-deftest pye-test-blocking-process-error-without-verbose ()
+ (let ((python-environment--verbose nil))
+ (should-error
+ (python-environment--blocking-process "DUMMY-MESSAGE" '("false")))))
+
+(ert-deftest pye-test-blocking-process-noerror-without-verbose ()
+ (let ((python-environment--verbose nil))
+ (python-environment--blocking-process "DUMMY-MESSAGE" '("true"))))
+
+(ert-deftest pye-test-deferred-process-error-with-verbose ()
+ (let ((python-environment--verbose t))
+ (pye-test-deferred-process-should-error)))
+
+(ert-deftest pye-test-deferred-process-noerror-with-verbose ()
+ (let ((python-environment--verbose t))
+ (deferred:sync!
+ (python-environment--deferred-process "DUMMY-MESSAGE" '("true")))))
+
+(ert-deftest pye-test-blocking-process-error-with-verbose ()
+ (let ((python-environment--verbose t))
+ (should-error
+ (python-environment--blocking-process "DUMMY-MESSAGE" '("false")))))
+
+(ert-deftest pye-test-blocking-process-noerror-with-verbose ()
+ (let ((python-environment--verbose t))
+ (python-environment--blocking-process "DUMMY-MESSAGE" '("true"))))
+
 (pye-deftest pye-test-make-environment-with-non-existing-command ()
  (should-error (python-environment-make nil '("non-existing-command"))))
 
@@ -103,7 +192,7 @@ variable can be given as ENVIRONMENT (see `pye-with-mixed-environment')."
  (should-error (pye-eval-in-subprocess '(error "some error"))))
 
 (pye-deftest pye-test-bare-make-environment ()
- (let ((tmp-home python-environment-root))
+ (let ((tmp-home python-environment-directory))
  (pye-eval-in-subprocess '(deferred:sync! (python-environment-make))
  `(("HOME" ,tmp-home)))
  (should (file-directory-p (expand-file-name