Use skip-unless in some python tests

* 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.

diff --git a/test/ChangeLog b/test/ChangeLog
index 59aacd13fd04fa342a58f053a002ff9f0118689d..c59548252ff70ed0b49cd5a1a1fc23e39e770a49 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -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.
 

diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index ef1c0155ab50c4a1e51a12071494b938147504b8..3c93c557b8ef6ef75f3794da74d1a7449fdf388a 100644 (file)
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -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))))