[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org b86989c8df 8/9: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org b86989c8df 8/9: Merge branch 'bugfix' |
Date: |
Thu, 29 Dec 2022 04:58:05 -0500 (EST) |
branch: externals/org
commit b86989c8df8c7a3afe23bf9d349f53d39ec3a053
Merge: dedf1cc21f e5c45358ae
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>
Merge branch 'bugfix'
---
testing/lisp/test-ob-octave.el | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/testing/lisp/test-ob-octave.el b/testing/lisp/test-ob-octave.el
index 6eb731295e..8b68150fb0 100644
--- a/testing/lisp/test-ob-octave.el
+++ b/testing/lisp/test-ob-octave.el
@@ -67,7 +67,6 @@
(ert-deftest ob-octave/graphics-file ()
"Graphics file. Test that link is correctly inserted and graphics file is
created (and not empty). Clean-up side-effects."
;; In case a prior test left the Error Output buffer hanging around.
- (skip-unless nil) ; FIXME: Failing on CI only
(when (get-buffer "*Org-Babel Error Output*")
(kill-buffer "*Org-Babel Error Output*"))
(let ((file (make-temp-file "test-ob-octave-" nil ".png")))
@@ -80,7 +79,12 @@ sombrero;
(org-babel-execute-src-block)
(should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file))
- (should (> (file-attribute-size (file-attributes file)) 0))
+ (should (or (> (file-attribute-size (file-attributes file)) 0)
+ ;; Avoid race condition on slow machines.
+ ;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
+ (progn
+ (sleep-for 1)
+ (> (file-attribute-size (file-attributes file)) 0))))
(should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up
(delete-file file)
@@ -89,7 +93,6 @@ sombrero;
(ert-deftest ob-octave/graphics-file-session ()
"Graphics file in a session. Test that session is started in *Inferior
Octave* buffer, link is correctly inserted and graphics file is created (and
not empty). Clean-up side-effects."
- (skip-unless nil) ; FIXME: Failing on CI only
(let ((file (make-temp-file "test-ob-octave-" nil ".png")))
(unwind-protect
(org-test-with-temp-text
@@ -102,7 +105,12 @@ sombrero;
(should (get-buffer "*Inferior Octave*"))
(should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file))
- (should (> (file-attribute-size (file-attributes file)) 0))
+ (or (> (file-attribute-size (file-attributes file)) 0)
+ ;; Avoid race condition on slow machines.
+ ;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
+ (progn
+ (sleep-for 1)
+ (> (file-attribute-size (file-attributes file)) 0)))
(should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up
(delete-file file)
@@ -113,7 +121,6 @@ sombrero;
(ert-deftest ob-octave/graphics-file-space ()
"Graphics file with a space in filename. Test that session is started in
*Inferior Octave* buffer, link is correctly inserted and graphics file is
created (and not empty). Clean-up side-effects."
- (skip-unless nil) ; FIXME: Failing on CI only
(let ((file (make-temp-file "test ob octave-" nil ".png")))
(unwind-protect
(org-test-with-temp-text
@@ -124,7 +131,12 @@ sombrero;
(org-babel-execute-src-block)
(should (search-forward (format "[[file:%s]]" file) nil nil))
(should (file-readable-p file))
- (should (> (file-attribute-size (file-attributes file)) 0))
+ (or (> (file-attribute-size (file-attributes file)) 0)
+ ;; Avoid race condition on slow machines.
+ ;; https://orgmode.org/list/87r0wk29dz.fsf@localhost
+ (progn
+ (sleep-for 1)
+ (> (file-attribute-size (file-attributes file)) 0)))
(should-not (get-buffer "*Org-Babel Error Output*")))
;; clean-up
(delete-file file)
- [elpa] externals/org updated (5549357bf2 -> a9c0d4cde2), ELPA Syncer, 2022/12/29
- [elpa] externals/org e8cb52bd3e 1/9: org-persist-read: Attempt to write newly register data before reading, ELPA Syncer, 2022/12/29
- [elpa] externals/org f8428d0f3e 2/9: org-fold-core--isearch-show: Small refactoring, ELPA Syncer, 2022/12/29
- [elpa] externals/org 14bfe2841c 5/9: org-persist: Use `list-data-mode' for stored data, ELPA Syncer, 2022/12/29
- [elpa] externals/org 13e78df46a 6/9: * lisp/org-persist.el: Update commentary, ELPA Syncer, 2022/12/29
- [elpa] externals/org a97b378ee5 4/9: org-persist-read: Do not return related containers by default, ELPA Syncer, 2022/12/29
- [elpa] externals/org ffec2db731 3/9: org-persist-write:elisp: Allow buffer-local/global elisp container scope, ELPA Syncer, 2022/12/29
- [elpa] externals/org b86989c8df 8/9: Merge branch 'bugfix',
ELPA Syncer <=
- [elpa] externals/org a9c0d4cde2 9/9: org-occur-in-agenda-files: Respect agenda restriction, ELPA Syncer, 2022/12/29
- [elpa] externals/org dedf1cc21f 7/9: org-persist: Add more normalizations and new `elisp-data' container, ELPA Syncer, 2022/12/29