[elpa] externals/hyperbole 8724f29 2/2: Merge branch 'master' of hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit 8724f29242b5f09930b87132d0af3b5c357e8822
Merge: 0d1b728 22d5a51
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole
---
 ChangeLog          |  5 +++++
 test/hbut-tests.el | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6aa8f9b..03e5ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-08-19  Mats Lidell  <matsl@gnu.org>
+
+* test/hbut-tests.el (hbut-tests:should-match-tmp-folder): Add check for
+    tmp folder.
+
 2021-07-20  Mats Lidell  <matsl@gnu.org>
 
 * hpath.el: Part two of patch from Stefan Monnier. Thank you Stefan. Use
diff --git a/test/hbut-tests.el b/test/hbut-tests.el
index 7303ef7..b87caed 100644
--- a/test/hbut-tests.el
+++ b/test/hbut-tests.el
@@ -20,6 +20,13 @@
 (require 'hactypes)
 (require 'el-mock)
 
+(defun hbut-tests:should-match-tmp-folder (tmp)
+  "Check TMP match either regular /tmp or private/tmp.
+Needed since hyperbole expands all links to absolute paths and
+/tmp can be a symbolic link."
+  (should (or (equal tmp '("/tmp"))
+              (equal tmp '("private/tmp")))))
+
 (ert-deftest ebut-program-link-to-directory ()
   "Programatically create ebut with link-to-directory."
   (let ((file (make-temp-file "hypb_" nil ".txt")))
@@ -67,7 +74,7 @@
           (let ((args (hbut:delete)))
             (should-not (hbut:at-p))
             (should (equal (hbdata:actype args) "actypes::link-to-directory"))
-            (should (equal (hbdata:args args) '("/tmp")))
+            (hbut-tests:should-match-tmp-folder (hbdata:args args))
             ))
       (delete-file file))))
 
@@ -93,7 +100,7 @@
             (gbut:ebut-program "global" 'link-to-directory "/tmp"))
          (with-current-buffer test-buffer
             (should (eq (hattr:get (hbut:at-p) 'actype) 
'actypes::link-to-directory))
-            (should (equal (hattr:get (hbut:at-p) 'args) '("/tmp")))
+            (hbut-tests:should-match-tmp-folder (hattr:get (hbut:at-p) 'args))
             (should (equal (hattr:get (hbut:at-p) 'lbl-key) "global")))))))
 
 (ert-deftest hypb:program-create-ebut-in-buffer ()