[Emacs-diffs] trunk r115206: Use skip-unless in some python tests

[Glenn Morris]

------------------------------------------------------------
revno: 115206
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-23 12:42:38 -0800
message:
  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.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/python-tests.el 
pythontests.el-20130220195218-kqcioz3fssz9hwe1-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-23 01:55:16 +0000
+++ b/test/ChangeLog    2013-11-23 20:42:38 +0000
@@ -1,5 +1,11 @@
 2013-11-23  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'test/automated/python-tests.el'
--- a/test/automated/python-tests.el    2013-08-13 16:36:32 +0000
+++ b/test/automated/python-tests.el    2013-11-23 20:42:38 +0000
@@ -1448,9 +1448,7 @@
   "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 @@
 
 (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 @@
 
 (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 @@
 
 (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 @@
 
 (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))))