From badf214db7c3032052c219de5733abef83e55635 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Mon, 16 Nov 2020 05:01:33 -0600 Subject: [PATCH] Tests: Adjust error message for Org 9.3 and/or Emacs 27.1 I don't know if this is due to the Org 9.3 link change or if something print/read-related changed in Emacs 27.1, but this should fix the test, hopefully on both versions. --- tests/test-org-ql.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/test-org-ql.el b/tests/test-org-ql.el index ed3ef06..be81d81 100644 --- a/tests/test-org-ql.el +++ b/tests/test-org-ql.el @@ -1205,8 +1205,11 @@ RESULTS should be a list of strings as returned by (expect (open-link unquoted-lambda-link) :to-throw 'error '("CAUTION: Link not opened because unsafe buffers-files parameter detected: (lambda nil (error UNSAFE))"))) (it "Errors for a quoted lambda in a list" - (expect (open-link quoted-lambda-in-list-link) - :to-throw 'error '("CAUTION: Link not opened because unsafe buffers-files parameter detected: ((quote (lambda nil (error UNSAFE))))"))) + (if (version< (org-version) "9.3") + (expect (open-link quoted-lambda-in-list-link) + :to-throw 'error '("CAUTION: Link not opened because unsafe buffers-files parameter detected: ((quote (lambda nil (error UNSAFE))))")) + (expect (open-link quoted-lambda-in-list-link) + :to-throw 'error '("CAUTION: Link not opened because unsafe buffers-files parameter detected: ('(lambda nil (error UNSAFE)))")))) (it "Errors for an unquoted lambda in a list" (expect (open-link unquoted-lambda-in-list-link) :to-throw 'error '("CAUTION: Link not opened because unsafe buffers-files parameter detected: ((lambda nil (error UNSAFE)))")))) @@ -1268,8 +1271,11 @@ RESULTS should be a list of strings as returned by (expect (open-link unquoted-lambda-link) :to-throw 'error '("CAUTION: Link not opened because unsafe sort parameter detected: (lambda (_ _) (error UNSAFE))"))) (it "Errors for a quoted lambda in a list" - (expect (open-link quoted-lambda-in-list-link) - :to-throw 'error '("CAUTION: Link not opened because unsafe sort parameter detected: ((quote (lambda (_ _) (error UNSAFE))))"))) + (if (version< (org-version) "9.3") + (expect (open-link quoted-lambda-in-list-link) + :to-throw 'error '("CAUTION: Link not opened because unsafe sort parameter detected: ((quote (lambda (_ _) (error UNSAFE))))")) + (expect (open-link quoted-lambda-in-list-link) + :to-throw 'error '("CAUTION: Link not opened because unsafe sort parameter detected: ('(lambda (_ _) (error UNSAFE)))")))) (it "Errors for an unquoted lambda in a list" (expect (open-link unquoted-lambda-in-list-link) :to-throw 'error '("CAUTION: Link not opened because unsafe sort parameter detected: ((lambda nil (error UNSAFE)))")))))))