[Emacs-diffs] master 33065aa: * test/automated/vc-tests.el: Try enabling tests on hydra.nixos.org.

[Glenn Morris]

branch: master
commit 33065aaf33a108877194aff79cc5c9f1b8578421
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * test/automated/vc-tests.el: Try enabling tests on hydra.nixos.org.
---
 test/automated/vc-tests.el |  132 +++++++++++++++++++++-----------------------
 1 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/test/automated/vc-tests.el b/test/automated/vc-tests.el
index 011acee..58d2237 100644
--- a/test/automated/vc-tests.el
+++ b/test/automated/vc-tests.el
@@ -527,75 +527,69 @@ For backends which dont support it, `vc-not-supported' is 
signalled."
 (defun vc-test--arch-enabled ()
   (executable-find vc-arch-program))
 
-;; There are too many failed test cases yet.  We suppress them on hydra.
-(if (getenv "NIX_STORE")
-    (ert-deftest vc-test ()
-      "Dummy test case for hydra."
-      (ert-pass))
-
-  ;; Create the test cases.
-  (dolist (backend vc-handled-backends)
-    (let ((backend-string (downcase (symbol-name backend))))
-      (require (intern (format "vc-%s" backend-string)))
-      (eval
-       ;; Check, whether the backend is supported.
-       `(when (funcall ',(intern (format "vc-test--%s-enabled" 
backend-string)))
-
-         (ert-deftest
-             ,(intern (format "vc-test-%s00-create-repo" backend-string)) ()
-           ,(format "Check `vc-create-repo' for the %s backend."
-                    backend-string)
-           (vc-test--create-repo ',backend))
-
-         (ert-deftest
-             ,(intern (format "vc-test-%s01-register" backend-string)) ()
-           ,(format
-             "Check `vc-register' and `vc-registered' for the %s backend."
-             backend-string)
-           (skip-unless
-            (ert-test-passed-p
-             (ert-test-most-recent-result
-              (ert-get-test
-               ',(intern
-                  (format "vc-test-%s00-create-repo" backend-string))))))
-           (vc-test--register ',backend))
-
-         (ert-deftest
-             ,(intern (format "vc-test-%s02-state" backend-string)) ()
-           ,(format "Check `vc-state' for the %s backend." backend-string)
-           (skip-unless
-            (ert-test-passed-p
-             (ert-test-most-recent-result
-              (ert-get-test
-               ',(intern
-                  (format "vc-test-%s01-register" backend-string))))))
-           (vc-test--state ',backend))
-
-         (ert-deftest
-             ,(intern (format "vc-test-%s03-working-revision" backend-string)) 
()
-           ,(format "Check `vc-working-revision' for the %s backend."
-                    backend-string)
-           (skip-unless
-            (ert-test-passed-p
-             (ert-test-most-recent-result
-              (ert-get-test
-               ',(intern
-                  (format "vc-test-%s01-register" backend-string))))))
-           (vc-test--working-revision ',backend))
-
-         (ert-deftest
-             ,(intern (format "vc-test-%s04-checkout-model" backend-string)) ()
-           ,(format "Check `vc-checkout-model' for the %s backend."
-                    backend-string)
-           ;; FIXME make this pass.
-           :expected-result ,(if (equal backend 'RCS) :failed :passed)
-           (skip-unless
-            (ert-test-passed-p
-             (ert-test-most-recent-result
-              (ert-get-test
-               ',(intern
-                  (format "vc-test-%s01-register" backend-string))))))
-           (vc-test--checkout-model ',backend)))))))
+;; Create the test cases.
+(dolist (backend vc-handled-backends)
+  (let ((backend-string (downcase (symbol-name backend))))
+    (require (intern (format "vc-%s" backend-string)))
+    (eval
+     ;; Check, whether the backend is supported.
+     `(when (funcall ',(intern (format "vc-test--%s-enabled" backend-string)))
+
+       (ert-deftest
+           ,(intern (format "vc-test-%s00-create-repo" backend-string)) ()
+         ,(format "Check `vc-create-repo' for the %s backend."
+                  backend-string)
+         (vc-test--create-repo ',backend))
+
+       (ert-deftest
+           ,(intern (format "vc-test-%s01-register" backend-string)) ()
+         ,(format
+           "Check `vc-register' and `vc-registered' for the %s backend."
+           backend-string)
+         (skip-unless
+          (ert-test-passed-p
+           (ert-test-most-recent-result
+            (ert-get-test
+             ',(intern
+                (format "vc-test-%s00-create-repo" backend-string))))))
+         (vc-test--register ',backend))
+
+       (ert-deftest
+           ,(intern (format "vc-test-%s02-state" backend-string)) ()
+         ,(format "Check `vc-state' for the %s backend." backend-string)
+         (skip-unless
+          (ert-test-passed-p
+           (ert-test-most-recent-result
+            (ert-get-test
+             ',(intern
+                (format "vc-test-%s01-register" backend-string))))))
+         (vc-test--state ',backend))
+
+       (ert-deftest
+           ,(intern (format "vc-test-%s03-working-revision" backend-string)) ()
+         ,(format "Check `vc-working-revision' for the %s backend."
+                  backend-string)
+         (skip-unless
+          (ert-test-passed-p
+           (ert-test-most-recent-result
+            (ert-get-test
+             ',(intern
+                (format "vc-test-%s01-register" backend-string))))))
+         (vc-test--working-revision ',backend))
+
+       (ert-deftest
+           ,(intern (format "vc-test-%s04-checkout-model" backend-string)) ()
+         ,(format "Check `vc-checkout-model' for the %s backend."
+                  backend-string)
+         ;; FIXME make this pass.
+         :expected-result ,(if (equal backend 'RCS) :failed :passed)
+         (skip-unless
+          (ert-test-passed-p
+           (ert-test-most-recent-result
+            (ert-get-test
+             ',(intern
+                (format "vc-test-%s01-register" backend-string))))))
+         (vc-test--checkout-model ',backend))))))
 
 (provide 'vc-tests)
 ;;; vc-tests.el ends here