branch: externals/hyperbole
commit c38d13751096304665e6c3675e2fd235f4a58ac6
Merge: 694f3110fd 988dc73672
Author: Bob Weiner <[email protected]>
Commit: Bob Weiner <[email protected]>
Merge branch 'master' of hyperbole
---
ChangeLog | 6 ++++++
test/demo-tests.el | 11 ++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 38434f30ef..f04b2fb2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-07-19 Mats Lidell <[email protected]>
+
+* test/demo-tests.el (fast-demo-key-series-shell-apropos): Add optional
+ whitespace after command to accomodate for different versions on
+ apropos.
+
2022-07-17 Mats Lidell <[email protected]>
* hypb.el (hypb:replace-match-string): Fix obsolete version to 8.0.1.
diff --git a/test/demo-tests.el b/test/demo-tests.el
index 4060d9ce8e..895dcc8152 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -3,7 +3,7 @@
;; Author: Mats Lidell <[email protected]>
;;
;; Orig-Date: 30-Jan-21 at 12:00:00
-;; Last-Mod: 19-Jun-22 at 20:25:19 by Bob Weiner
+;; Last-Mod: 16-Jul-22 at 22:39:47 by Mats Lidell
;;
;; Copyright (C) 2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -580,12 +580,9 @@ enough files with matching mode loaded."
(action-key)
(hy-test-helpers:consume-input-events)
(with-current-buffer shell-buffer-name
- (let ((buf-len (point-max)))
- (sleep-for 0.1)
- (while (/= buf-len (point-max))
- (setq buf-len (point-max))
- (accept-process-output)
- (sleep-for 0.1)))
+ (with-timeout (5 (ert-fail "Test timed out"))
+ (while (not (string-match-p "\ngrep ?\(1\).*-"
(buffer-substring-no-properties (point-min) (point-max))))
+ (accept-process-output (get-buffer-process
shell-buffer-name))))
(should (string-match-p "\ngrep ?\(1\).*-"
(buffer-substring-no-properties (point-min) (point-max))))))
(set-process-query-on-exit-flag (get-buffer-process shell-buffer-name)
nil)
(kill-buffer shell-buffer-name))))
