From: Jim Porter <jporterbugs@gmail.com>
Date: Wed, 17 Jan 2024 17:32:18 +0000 (-0800)
Subject: ; Fix test failures from the fix for bug#67661
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f5faad249747ce5bd4b7f2968f737206c136265;p=emacs.git

; Fix test failures from the fix for bug#67661

* test/lisp/eshell/em-cmpl-tests.el
  (em-cmpl-test/file-completion/non-unique): Make test more robust.
---

diff --git a/test/lisp/eshell/em-cmpl-tests.el b/test/lisp/eshell/em-cmpl-tests.el
index 13e42ffac88..f778816c4e1 100644
--- a/test/lisp/eshell/em-cmpl-tests.el
+++ b/test/lisp/eshell/em-cmpl-tests.el
@@ -175,18 +175,18 @@ ACTUAL and EXPECTED should both be lists of strings."
    (ert-with-temp-directory default-directory
      (write-region nil nil (expand-file-name "file.txt"))
      (write-region nil nil (expand-file-name "file.el"))
+     ;; Complete the first time.  This should insert the common prefix
+     ;; of our completions.
      (should (equal (eshell-insert-and-complete "echo fi")
                     "echo file."))
+     ;; Make sure the completions buffer isn't displayed.
+     (should-not (get-buffer-window "*Completions*"))
      ;; Now try completing again.
      (let ((minibuffer-message-timeout 0)
            (inhibit-message t))
        (completion-at-point))
-     ;; FIXME: We can't use `current-message' here.
-     (with-current-buffer (messages-buffer)
-       (save-excursion
-         (goto-char (point-max))
-         (forward-line -1)
-         (should (looking-at "Complete, but not unique")))))))
+     ;; This time, we should display the completions buffer.
+     (should (get-buffer-window "*Completions*")))))
 
 (ert-deftest em-cmpl-test/file-completion/glob ()
   "Test completion of file names using a glob."