procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use skip-unless in some python tests

Browse source 
* test/automated/python-tests.el (python-shell-parse-command-1)
(python-shell-make-comint-1, python-shell-make-comint-2)
(python-shell-get-process-1)
(python-shell-internal-get-or-create-process-1):
Skip rather than fail if prereqs not found.
This commit is contained in:
Glenn Morris 2013-11-23 12:42:38 -08:00
parent 3cfb6af3af
commit f4d341afb6
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/ChangeLog
View file

@ -1,5 +1,11 @@
2013-11-23 Glenn Morris <rgm@gnu.org>
* automated/python-tests.el (python-shell-parse-command-1)
(python-shell-make-comint-1, python-shell-make-comint-2)
(python-shell-get-process-1)
(python-shell-internal-get-or-create-process-1):
Skip rather than fail if prereqs not found.
* automated/Makefile.in (emacs):
Empty EMACSLOADPATH rather than unsetting.

20
test/automated/python-tests.el
View file

@ -1448,9 +1448,7 @@ def f():
"Check the command to execute is calculated correctly.
Using `python-shell-interpreter' and
`python-shell-interpreter-args'."
:expected-result (if (executable-find python-tests-shell-interpreter)
:passed
:failed)
(skip-unless (executable-find python-tests-shell-interpreter))
(let ((python-shell-interpreter (executable-find
python-tests-shell-interpreter))
(python-shell-interpreter-args "-B"))
@ -1522,9 +1520,7 @@ Using `python-shell-interpreter' and
(ert-deftest python-shell-make-comint-1 ()
"Check comint creation for global shell buffer."
:expected-result (if (executable-find python-tests-shell-interpreter)
:passed
:failed)
(skip-unless (executable-find python-tests-shell-interpreter))
(let* ((python-shell-interpreter
(executable-find python-tests-shell-interpreter))
(proc-name (python-shell-get-process-name nil))
@ -1544,9 +1540,7 @@ Using `python-shell-interpreter' and
(ert-deftest python-shell-make-comint-2 ()
"Check comint creation for internal shell buffer."
:expected-result (if (executable-find python-tests-shell-interpreter)
:passed
:failed)
(skip-unless (executable-find python-tests-shell-interpreter))
(let* ((python-shell-interpreter
(executable-find python-tests-shell-interpreter))
(proc-name (python-shell-internal-get-process-name))
@ -1566,9 +1560,7 @@ Using `python-shell-interpreter' and
(ert-deftest python-shell-get-process-1 ()
"Check dedicated shell process preference over global."
:expected-result (if (executable-find python-tests-shell-interpreter)
:passed
:failed)
(skip-unless (executable-find python-tests-shell-interpreter))
(python-tests-with-temp-file
""
(let* ((python-shell-interpreter
@ -1627,9 +1619,7 @@ Using `python-shell-interpreter' and
(ert-deftest python-shell-internal-get-or-create-process-1 ()
"Check internal shell process creation fallback."
:expected-result (if (executable-find python-tests-shell-interpreter)
:passed
:failed)
(skip-unless (executable-find python-tests-shell-interpreter))
(python-tests-with-temp-file
""
(should (not (process-live-p (python-shell-internal-get-process-name))))