From: "Kévin Le Gouguec" <kevin.legouguec@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: Bastien <bzg@gnu.org>, emacs-orgmode@gnu.org
Subject: Re: Failing tests
Date: Mon, 01 Jun 2020 16:56:29 +0200 [thread overview]
Message-ID: <87mu5mhm1u.fsf@gmail.com> (raw)
In-Reply-To: <87r1uyhmfk.fsf@gmail.com> ("Kévin Le Gouguec"'s message of "Mon, 01 Jun 2020 16:48:15 +0200")
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
Kévin Le Gouguec <kevin.legouguec@gmail.com> writes:
> Absolutely. I've attached a patch to that effect.
I just realized that these let-bindings probably deserved explanatory
comments. Here is an updated patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Make-tests-robust-with-respect-to-mailcap-entries.patch --]
[-- Type: text/x-diff, Size: 13274 bytes --]
From f996ec3a10a845abae2fa463ab0ea7a761af1707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Le=20Gouguec?= <kevin.legouguec@gmail.com>
Date: Mon, 1 Jun 2020 16:07:44 +0200
Subject: [PATCH] Make tests robust with respect to mailcap entries
When /etc/mailcap specifies a program for text/plain
files (e.g. less(1)), org-open-file will run this program instead of
visiting the file. This throws off some tests which expect
extension-less temporary files to be visited.
* testing/lisp/test-ob-tangle.el (ob-tangle/jump-to-org):
* testing/lisp/test-org-attach.el (test-org-attach/dir): Rig
org-file-apps so that temporary files are visited inside Emacs.
---
testing/lisp/test-ob-tangle.el | 124 +++++++++++++-------------
testing/lisp/test-org-attach.el | 148 ++++++++++++++++----------------
2 files changed, 138 insertions(+), 134 deletions(-)
diff --git a/testing/lisp/test-ob-tangle.el b/testing/lisp/test-ob-tangle.el
index 2283037fc..7b1f617ed 100644
--- a/testing/lisp/test-ob-tangle.el
+++ b/testing/lisp/test-ob-tangle.el
@@ -124,24 +124,26 @@ echo 1
(ert-deftest ob-tangle/jump-to-org ()
"Test `org-babel-tangle-jump-to-org' specifications."
- ;; Standard test.
- (should
- (equal
- "* H\n#+begin_src emacs-lisp\n1\n#+end_src"
- (org-test-with-temp-text-in-file
- "* H\n#+begin_src emacs-lisp\n1\n#+end_src"
- (let ((file (buffer-file-name)))
- (org-test-with-temp-text
- (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
- (file-name-nondirectory file))
- (org-babel-tangle-jump-to-org)
- (buffer-string))))))
- ;; Multiple blocks in the same section.
- (should
- (equal
- "2"
- (org-test-with-temp-text-in-file
- "* H
+ ;; Make sure temporary files will be visited inside Emacs.
+ (let ((org-file-apps '((t . emacs))))
+ ;; Standard test.
+ (should
+ (equal
+ "* H\n#+begin_src emacs-lisp\n1\n#+end_src"
+ (org-test-with-temp-text-in-file
+ "* H\n#+begin_src emacs-lisp\n1\n#+end_src"
+ (let ((file (buffer-file-name)))
+ (org-test-with-temp-text
+ (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
+ (file-name-nondirectory file))
+ (org-babel-tangle-jump-to-org)
+ (buffer-string))))))
+ ;; Multiple blocks in the same section.
+ (should
+ (equal
+ "2"
+ (org-test-with-temp-text-in-file
+ "* H
first block
@@ -155,49 +157,49 @@ another block
2
#+end_src
"
- (let ((file (buffer-file-name)))
- (org-test-with-temp-text
- (format ";; [[file:%s][H:2]]\n<point>2\n;; H:2 ends here\n"
- (file-name-nondirectory file))
- (org-babel-tangle-jump-to-org)
- (buffer-substring (line-beginning-position)
- (line-end-position)))))))
- ;; Preserve position within the source code.
- (should
- (equal
- "1)"
- (org-test-with-temp-text-in-file
- "* H\n#+begin_src emacs-lisp\n(+ 1 1)\n#+end_src"
- (let ((file (buffer-file-name)))
- (org-test-with-temp-text
- (format ";; [[file:%s][H:1]]\n(+ 1 <point>1)\n;; H:1 ends here\n"
- (file-name-nondirectory file))
- (org-babel-tangle-jump-to-org)
- (buffer-substring-no-properties (point) (line-end-position)))))))
- ;; Blocks before first heading.
- (should
- (equal
- "Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
- (org-test-with-temp-text-in-file
- "Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
- (let ((file (buffer-file-name)))
- (org-test-with-temp-text
- (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
- (file-name-nondirectory file))
- (org-babel-tangle-jump-to-org)
- (buffer-string))))))
- ;; Special case: buffer starts with a source block.
- (should
- (equal
- "#+begin_src emacs-lisp\n1\n#+end_src\n* H"
- (org-test-with-temp-text-in-file
- "#+begin_src emacs-lisp\n1\n#+end_src\n* H"
- (let ((file (buffer-file-name)))
- (org-test-with-temp-text
- (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
- (file-name-nondirectory file))
- (org-babel-tangle-jump-to-org)
- (buffer-string)))))))
+ (let ((file (buffer-file-name)))
+ (org-test-with-temp-text
+ (format ";; [[file:%s][H:2]]\n<point>2\n;; H:2 ends here\n"
+ (file-name-nondirectory file))
+ (org-babel-tangle-jump-to-org)
+ (buffer-substring (line-beginning-position)
+ (line-end-position)))))))
+ ;; Preserve position within the source code.
+ (should
+ (equal
+ "1)"
+ (org-test-with-temp-text-in-file
+ "* H\n#+begin_src emacs-lisp\n(+ 1 1)\n#+end_src"
+ (let ((file (buffer-file-name)))
+ (org-test-with-temp-text
+ (format ";; [[file:%s][H:1]]\n(+ 1 <point>1)\n;; H:1 ends here\n"
+ (file-name-nondirectory file))
+ (org-babel-tangle-jump-to-org)
+ (buffer-substring-no-properties (point) (line-end-position)))))))
+ ;; Blocks before first heading.
+ (should
+ (equal
+ "Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
+ (org-test-with-temp-text-in-file
+ "Buffer start\n#+begin_src emacs-lisp\n1\n#+end_src\n* H"
+ (let ((file (buffer-file-name)))
+ (org-test-with-temp-text
+ (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
+ (file-name-nondirectory file))
+ (org-babel-tangle-jump-to-org)
+ (buffer-string))))))
+ ;; Special case: buffer starts with a source block.
+ (should
+ (equal
+ "#+begin_src emacs-lisp\n1\n#+end_src\n* H"
+ (org-test-with-temp-text-in-file
+ "#+begin_src emacs-lisp\n1\n#+end_src\n* H"
+ (let ((file (buffer-file-name)))
+ (org-test-with-temp-text
+ (format ";; [[file:%s][H:1]]\n<point>1\n;; H:1 ends here\n"
+ (file-name-nondirectory file))
+ (org-babel-tangle-jump-to-org)
+ (buffer-string))))))))
(ert-deftest ob-tangle/nested-block ()
"Test tangling of org file with nested block."
diff --git a/testing/lisp/test-org-attach.el b/testing/lisp/test-org-attach.el
index f910526c2..cdd1afb3d 100644
--- a/testing/lisp/test-org-attach.el
+++ b/testing/lisp/test-org-attach.el
@@ -30,80 +30,82 @@
(ert-deftest test-org-attach/dir ()
"Test `org-attach-get' specifications."
- (should (equal "Text in fileA\n"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 157) ;; First attachment link
- (org-open-at-point)
- (buffer-string))))
- (should-not (equal "Text in fileB\n"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 219) ;; Second attachment link
- (let ((org-attach-use-inheritance nil))
- (org-open-at-point)
- (buffer-string)))))
- (should (equal "Text in fileB\n"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 219) ;; Second attachment link
- (let ((org-attach-use-inheritance t))
+ ;; Make sure example files will be visited inside Emacs.
+ (let ((org-file-apps '((t . emacs))))
+ (should (equal "Text in fileA\n"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 157) ;; First attachment link
(org-open-at-point)
- (buffer-string)))))
- (should-not (equal "att1"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 179) ;; H1.1
- (let ((org-attach-use-inheritance nil))
- (org-attach-dir)))))
- (should (equal "att1"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 179) ;; H1.1
- (let ((org-attach-use-inheritance t))
- (org-attach-dir)))))
- (should (equal '("fileC" "fileD")
- (org-test-in-example-file org-test-attachments-file
- (goto-char 239) ;; H1.2
- (org-attach-file-list (org-attach-dir)))))
- (should (equal '("fileC" "fileD")
- (org-test-in-example-file org-test-attachments-file
- (goto-char 239) ;; H1.2
- (org-attach-file-list (org-attach-dir)))))
- (should (equal '("fileE")
- (org-test-in-example-file org-test-attachments-file
- (goto-char 289) ;; H2
- (let ((org-attach-id-dir "data/"))
- (org-attach-file-list (org-attach-dir))))))
- (should (equal "peek-a-boo\n"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 289) ;; H2
- (let ((org-attach-id-dir "data/"))
- (org-attach-open-in-emacs)
- (buffer-string)))))
- (should (equal '("fileA" "fileB")
- (org-test-in-example-file org-test-attachments-file
- (goto-char 336) ;; H3
- (org-attach-file-list (org-attach-dir)))))
- ;; Test for folder not initialized in the filesystem
- (should-not (org-test-in-example-file org-test-attachments-file
- (goto-char 401) ;; H3.1
- (let ((org-attach-use-inheritance nil)
- (org-attach-id-dir "data/"))
- (org-attach-dir))))
- ;; Not yet initialized folder should be found if no-fs-check is
- ;; non-nil
- (should (equal "data/ab/cd12345"
- (org-test-in-example-file org-test-attachments-file
- (goto-char 401) ;; H3.1
- (let ((org-attach-use-inheritance nil)
- (org-attach-id-dir "data/"))
- (file-relative-name (org-attach-dir nil t))))))
- (should (equal '("fileA" "fileB")
- (org-test-in-example-file org-test-attachments-file
- (goto-char 401) ;; H3.1
- (let ((org-attach-use-inheritance t))
- ;; This is where it gets a bit sketchy...! DIR always has
- ;; priority over ID, even if ID is declared "higher up" in the
- ;; tree. This can potentially be revised. But it is also
- ;; pretty clean. DIR is always higher in priority than ID right
- ;; now, no matter the depth in the tree.
- (org-attach-file-list (org-attach-dir)))))))
+ (buffer-string))))
+ (should-not (equal "Text in fileB\n"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 219) ;; Second attachment link
+ (let ((org-attach-use-inheritance nil))
+ (org-open-at-point)
+ (buffer-string)))))
+ (should (equal "Text in fileB\n"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 219) ;; Second attachment link
+ (let ((org-attach-use-inheritance t))
+ (org-open-at-point)
+ (buffer-string)))))
+ (should-not (equal "att1"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 179) ;; H1.1
+ (let ((org-attach-use-inheritance nil))
+ (org-attach-dir)))))
+ (should (equal "att1"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 179) ;; H1.1
+ (let ((org-attach-use-inheritance t))
+ (org-attach-dir)))))
+ (should (equal '("fileC" "fileD")
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 239) ;; H1.2
+ (org-attach-file-list (org-attach-dir)))))
+ (should (equal '("fileC" "fileD")
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 239) ;; H1.2
+ (org-attach-file-list (org-attach-dir)))))
+ (should (equal '("fileE")
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 289) ;; H2
+ (let ((org-attach-id-dir "data/"))
+ (org-attach-file-list (org-attach-dir))))))
+ (should (equal "peek-a-boo\n"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 289) ;; H2
+ (let ((org-attach-id-dir "data/"))
+ (org-attach-open-in-emacs)
+ (buffer-string)))))
+ (should (equal '("fileA" "fileB")
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 336) ;; H3
+ (org-attach-file-list (org-attach-dir)))))
+ ;; Test for folder not initialized in the filesystem
+ (should-not (org-test-in-example-file org-test-attachments-file
+ (goto-char 401) ;; H3.1
+ (let ((org-attach-use-inheritance nil)
+ (org-attach-id-dir "data/"))
+ (org-attach-dir))))
+ ;; Not yet initialized folder should be found if no-fs-check is
+ ;; non-nil
+ (should (equal "data/ab/cd12345"
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 401) ;; H3.1
+ (let ((org-attach-use-inheritance nil)
+ (org-attach-id-dir "data/"))
+ (file-relative-name (org-attach-dir nil t))))))
+ (should (equal '("fileA" "fileB")
+ (org-test-in-example-file org-test-attachments-file
+ (goto-char 401) ;; H3.1
+ (let ((org-attach-use-inheritance t))
+ ;; This is where it gets a bit sketchy...! DIR always has
+ ;; priority over ID, even if ID is declared "higher up" in the
+ ;; tree. This can potentially be revised. But it is also
+ ;; pretty clean. DIR is always higher in priority than ID right
+ ;; now, no matter the depth in the tree.
+ (org-attach-file-list (org-attach-dir))))))))
(ert-deftest test-org-attach/dired-attach-to-next-best-subtree/1 ()
"Attach file at point in dired to subtree."
--
2.17.1
next prev parent reply other threads:[~2020-06-01 14:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <21b0cd85-d678-2fe6-3c22-e41abc6cf242@guttersohn.org>
[not found] ` <87wo51jo5w.fsf@gnu.org>
2020-05-27 22:20 ` Possible fix for :includes header argument in org-babel C source blocks Kévin Le Gouguec
2020-05-28 2:30 ` Kyle Meyer
2020-05-28 8:25 ` Kévin Le Gouguec
2020-05-28 10:09 ` Kévin Le Gouguec
2020-05-29 2:47 ` Kyle Meyer
2020-05-29 12:41 ` Failing tests (was: Possible fix for :includes header argument in org-babel C source blocks) Kévin Le Gouguec
2020-05-31 4:59 ` Kyle Meyer
2020-06-01 14:48 ` Failing tests Kévin Le Gouguec
2020-06-01 14:56 ` Kévin Le Gouguec [this message]
2020-06-03 4:20 ` Kyle Meyer
2020-06-01 13:54 ` Bastien
2020-05-29 3:37 ` Possible fix for :includes header argument in org-babel C source blocks Brandon Guttersohn
2020-05-29 9:57 ` Kévin Le Gouguec
2020-05-30 17:29 ` Brandon Guttersohn
2020-06-01 13:55 ` Bastien
2020-06-01 20:17 ` Kévin Le Gouguec
2020-06-02 0:02 ` Brandon Guttersohn
2020-05-29 2:45 ` Kyle Meyer
2020-04-17 23:02 Failing tests Marco Wahl
2020-04-21 3:00 ` Kyle Meyer
2020-04-21 9:32 ` Marco Wahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mu5mhm1u.fsf@gmail.com \
--to=kevin.legouguec@gmail.com \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).