summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Hetzner <egh@e6h.org>2016-02-08 21:40:11 -0800
committerAchim Gratz <Stromeko@Stromeko.DE>2016-02-14 12:14:24 +0100
commita4cfd3343a83b5b8cd2dfe5ac83b8f9a02b837a7 (patch)
tree7f861245f972b4c6dd88d9f1843757518ab3a073
parentd846817f9d53204847ce3e34080126ab0f37fe97 (diff)
downloadorg-mode-a4cfd3343a83b5b8cd2dfe5ac83b8f9a02b837a7.tar.gz
org-attach: Prevent test fails on systems without git-annex
* testing/lisp/test-org-attach-annex.el: Move all org-attach tests that use git-annex to this file, which can test for the presence of git-annex. Prevents tests failing on systems where git-annex is not installed.
-rw-r--r--testing/lisp/test-org-attach-annex.el (renamed from testing/lisp/test-org-attach.el)7
1 files changed, 3 insertions, 4 deletions
diff --git a/testing/lisp/test-org-attach.el b/testing/lisp/test-org-attach-annex.el
index 9772bd7..44b4ad0 100644
--- a/testing/lisp/test-org-attach.el
+++ b/testing/lisp/test-org-attach-annex.el
@@ -1,4 +1,4 @@
-;;; test-org-attach.el --- Tests for Org Attach
+;;; test-org-annex-attach.el --- Tests for Org Attach with git-annex
;;
;; Copyright (c) 2016 Erik Hetzner
;; Authors: Erik Hetzner
@@ -19,6 +19,7 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
+(org-test-for-executable "git-annex")
(require 'org-attach)
(require 'cl-lib)
@@ -32,7 +33,6 @@
,@body))))
(ert-deftest test-org-attach/use-annex ()
- (org-test-for-executable "git-annex")
(test-org-attach-annex/with-annex
(let ((org-attach-git-annex-cutoff 1))
(should (org-attach-use-annex)))
@@ -50,7 +50,6 @@
(delete-directory tmpdir 'recursive))))
(ert-deftest test-org-attach/get-maybe ()
- (org-test-for-executable "git-annex")
(test-org-attach-annex/with-annex
(let ((path (expand-file-name "test-file"))
(annex-dup (make-temp-file "org-annex-test" t)))
@@ -94,4 +93,4 @@
(should (string-equal "hello world\n" (buffer-string))))
(should (eq called 'was-called)))))))
-;;; test-org-attach.el ends here
+;;; test-org-attach-annex.el ends here