[Emacs-diffs] trunk r114997: Skip some tests rather than expect failure when prereqs not met

[Glenn Morris]

------------------------------------------------------------
revno: 114997
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-11-05 23:50:18 -0800
message:
  Skip some tests rather than expect failure when prereqs not met
  
  * automated/flymake-tests.el (warning-predicate-rx-gcc)
  (warning-predicate-function-gcc, warning-predicate-rx-perl)
  (warning-predicate-function-perl):
  * automated/info-xref.el (info-xref-test-makeinfo):
  * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
  (vc-bzr-test-faulty-bzr-autoloads): Skip rather than expect failure.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/flymake-tests.el 
flymaketests.el-20130621142346-ara3p0outs2ckhw3-2
  test/automated/info-xref.el    infoxref.el-20130626015103-9one3hc3rycla2w1-1
  test/automated/vc-bzr.el       vcbzr.el-20111020033852-tb09uuuxskzxqlzo-1

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-05 14:46:57 +0000
+++ b/test/ChangeLog    2013-11-06 07:50:18 +0000
@@ -1,3 +1,12 @@
+2013-11-06  Glenn Morris  <address@hidden>
+
+       * automated/flymake-tests.el (warning-predicate-rx-gcc)
+       (warning-predicate-function-gcc, warning-predicate-rx-perl)
+       (warning-predicate-function-perl):
+       * automated/info-xref.el (info-xref-test-makeinfo):
+       * automated/vc-bzr.el (vc-bzr-test-bug9726, vc-bzr-test-bug9781)
+       (vc-bzr-test-faulty-bzr-autoloads): Skip rather than expect failure.
+
 2013-11-05  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el: New file.

=== modified file 'test/automated/flymake-tests.el'
--- a/test/automated/flymake-tests.el   2013-11-05 02:54:38 +0000
+++ b/test/automated/flymake-tests.el   2013-11-06 07:50:18 +0000
@@ -47,28 +47,26 @@
 
 (ert-deftest warning-predicate-rx-gcc ()
   "Test GCC warning via regexp predicate."
-  :expected-result (if (executable-find "gcc") :passed :failed)
+  (skip-unless (executable-find "gcc"))
   (should (eq 'flymake-warnline
               (flymake-tests--current-face "test.c" "^[Ww]arning"))))
 
 (ert-deftest warning-predicate-function-gcc ()
   "Test GCC warning via function predicate."
-  :expected-result (if (and (executable-find "gcc") (executable-find "make"))
-                       :passed
-                     :failed)
+  (skip-unless (and (executable-find "gcc") (executable-find "make")))
   (should (eq 'flymake-warnline
               (flymake-tests--current-face "test.c"
                (lambda (msg) (string-match "^[Ww]arning" msg))))))
 
 (ert-deftest warning-predicate-rx-perl ()
   "Test perl warning via regular expression predicate."
-  :expected-result (if (executable-find "perl") :passed :failed)
+  (skip-unless (executable-find "perl"))
   (should (eq 'flymake-warnline
               (flymake-tests--current-face "test.pl" "^Scalar value"))))
 
 (ert-deftest warning-predicate-function-perl ()
   "Test perl warning via function predicate."
-  :expected-result (if (executable-find "perl") :passed :failed)
+  (skip-unless (executable-find "perl"))
   (should (eq 'flymake-warnline
               (flymake-tests--current-face
                "test.pl"

=== modified file 'test/automated/info-xref.el'
--- a/test/automated/info-xref.el       2013-06-26 01:52:09 +0000
+++ b/test/automated/info-xref.el       2013-11-06 07:50:18 +0000
@@ -95,8 +95,7 @@
 
 (ert-deftest info-xref-test-makeinfo ()
   "Test that info-xref can parse basic makeinfo output."
-  :expected-result (if (executable-find "makeinfo") :passed :failed)
-  (should (executable-find "makeinfo"))
+  (skip-unless (executable-find "makeinfo"))
   (let ((tempfile (make-temp-file "info-xref-test" nil ".texi"))
         (tempfile2 (make-temp-file "info-xref-test2" nil ".texi"))
         (errflag t))

=== modified file 'test/automated/vc-bzr.el'
--- a/test/automated/vc-bzr.el  2013-01-01 09:11:05 +0000
+++ b/test/automated/vc-bzr.el  2013-11-06 07:50:18 +0000
@@ -27,14 +27,9 @@
 (require 'vc-bzr)
 (require 'vc-dir)
 
-;; FIXME it would be better to skip all these tests if there is no
-;; bzr installed.  We could just put everything inside an IF
-;; statement, but it would be nice if ERT had a "skipped" facility (?).
-
 (ert-deftest vc-bzr-test-bug9726 ()
   "Test for http://debbugs.gnu.org/9726 ."
-  :expected-result (if (executable-find vc-bzr-program) :passed :failed)
-  (should (executable-find vc-bzr-program))
+  (skip-unless (executable-find vc-bzr-program))
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (ignored-dir (expand-file-name "ignored-dir" tempdir))
          (default-directory (file-name-as-directory tempdir)))
@@ -64,8 +59,7 @@
 ;; Not specific to bzr.
 (ert-deftest vc-bzr-test-bug9781 ()
   "Test for http://debbugs.gnu.org/9781 ."
-  :expected-result (if (executable-find vc-bzr-program) :passed :failed)
-  (should (executable-find vc-bzr-program))
+  (skip-unless (executable-find vc-bzr-program))
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (subdir (expand-file-name "subdir" tempdir))
          (file (expand-file-name "file" tempdir))
@@ -101,8 +95,7 @@
 ;; http://lists.gnu.org/archive/html/help-gnu-emacs/2012-04/msg00145.html
 (ert-deftest vc-bzr-test-faulty-bzr-autoloads ()
   "Test we can generate autoloads in a bzr directory when bzr is faulty."
-  :expected-result (if (executable-find vc-bzr-program) :passed :failed)
-  (should (executable-find vc-bzr-program))
+  (skip-unless (executable-find vc-bzr-program))
   (let* ((tempdir (make-temp-file "vc-bzr-test" t))
          (file (expand-file-name "foo.el" tempdir))
          (default-directory (file-name-as-directory tempdir))