(with-current-buffer temp-buffer
(insert message "\n")))))
(let ((noninteractive t))
- (ert-run-tests-batch ',selector))
+ ;; Prevent activation of the mark and
+ ;; other actions taken by the tests
+ ;; from affecting the test buffer.
+ (with-temp-buffer
+ (ert-run-tests-batch ',selector)))
(insert "=== Test execution complete ===\n")
(buffer-substring-no-properties
(point-min) (point-max)))))))
;;; Code:
(require 'ert)
+(require 'ert-x)
(require 'esh-mode)
(require 'eshell)
(require 'em-alias)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(ert-deftest em-alias-test/simple-alias ()
(require 'ert)
(require 'em-basic)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(require 'em-hist)
(require 'em-tramp)
(require 'em-unix)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(require 'esh-mode)
(require 'eshell)
(require 'em-dirs)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
\f
(require 'cl-lib)
(require 'ert)
(require 'ert-x)
+(require 'ert-x)
(require 'em-extpipe)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defmacro em-extpipe-tests--deftest (name input &rest body)
(declare (indent 2))
(require 'tramp)
(require 'ert)
+(require 'ert-x)
(require 'em-glob)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-prefer-lisp-functions)
(require 'ert-x)
(require 'em-hist)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(cl-defun em-hist-test/check-history-file (file-name expected &optional
(expected-ring t))
(require 'eshell)
(require 'em-glob)
(require 'em-pred)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(require 'ert)
(require 'eshell)
(require 'em-prompt)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defmacro em-prompt-test--with-multiline (&rest body)
"Execute BODY with a multiline Eshell prompt."
(require 'esh-mode)
(require 'eshell)
(require 'em-script)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-execute-file-output)
(defvar this-directory (file-name-directory
(or load-file-name default-directory))))
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers" this-directory))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(require 'ert)
(require 'esh-mode)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(require 'ert)
(require 'esh-mode)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(require 'esh-mode)
(require 'esh-ext)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(require 'ert-x)
(require 'esh-mode)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(require 'eshell)
(require 'em-banner)
(require 'em-prompt)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(require 'esh-mode)
(require 'eshell)
(require 'em-prompt) ; For `eshell-previous-prompt'
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar esh-proc-test--output-cmd
(concat "sh -c '"
(require 'tramp)
(require 'ert)
(require 'esh-util)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
;;; Tests:
(require 'esh-mode)
(require 'esh-var)
(require 'eshell)
+(require 'ert-x)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(defvar eshell-test-begin nil)
+++ /dev/null
-;;; eshell-tests-helpers.el --- Eshell test suite helpers -*- lexical-binding:t -*-
-
-;; Copyright (C) 1999-2025 Free Software Foundation, Inc.
-
-;; Author: John Wiegley <johnw@gnu.org>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Eshell test suite helpers.
-
-;;; Code:
-
-(require 'ert)
-(require 'ert-x)
-(require 'esh-mode)
-(require 'eshell)
-
-(defvar eshell-aliases-file nil)
-(defvar eshell-command-aliases-list nil)
-(defvar eshell-history-file-name nil)
-(defvar eshell-last-dir-ring-file-name nil)
-
-(defvar eshell-test--max-wait-time 5
- "The maximum amount of time to wait for a condition to resolve, in seconds.
-See `eshell-wait-for'.")
-
-(defun eshell-tests-remote-accessible-p ()
- "Return if a test involving remote files can proceed.
-If using this function, be sure to load `tramp' near the
-beginning of the test file."
- (ignore-errors
- (and
- (file-remote-p ert-remote-temporary-file-directory)
- (file-directory-p ert-remote-temporary-file-directory)
- (file-writable-p ert-remote-temporary-file-directory))))
-
-(defmacro with-temp-eshell-settings (&rest body)
- "Configure Eshell to leave no trace behind, and then evaluate BODY."
- (declare (indent 0))
- `(ert-with-temp-directory eshell-directory-name
- (let (;; We want no history file, so prevent Eshell from falling
- ;; back on $HISTFILE.
- (process-environment (cons "HISTFILE" process-environment))
- ;; Enable process debug instrumentation. We may be able to
- ;; remove this eventually once we're confident that all the
- ;; process bugs have been worked out. (At that point, we can
- ;; just enable this selectively when needed.) See also
- ;; `eshell-test-command-result' below.
- (eshell-debug-command (cons 'process eshell-debug-command))
- (eshell-aliases-file nil)
- (eshell-command-aliases-list nil)
- (eshell-history-file-name nil)
- (eshell-last-dir-ring-file-name nil)
- (eshell-module-loading-messages nil))
- ,@body)))
-
-(defmacro with-temp-eshell (&rest body)
- "Evaluate BODY in a temporary Eshell buffer."
- (declare (indent 0))
- `(save-current-buffer
- (with-temp-eshell-settings
- (let ((eshell-buffer (eshell t)))
- (unwind-protect
- (with-current-buffer eshell-buffer
- ,@body)
- (let (kill-buffer-query-functions)
- (kill-buffer eshell-buffer)))))))
-
-(defmacro eshell-with-temp-buffer (bufname text &rest body)
- "Create a temporary buffer containing TEXT and evaluate BODY there.
-BUFNAME will be set to the name of the temporary buffer."
- (declare (indent 2))
- `(with-temp-buffer
- (insert ,text)
- (rename-buffer "eshell-temp-buffer" t)
- (let ((,bufname (buffer-name)))
- ,@body)))
-
-(defun eshell-wait-for (predicate &optional message)
- "Wait until PREDICATE returns non-nil.
-If this takes longer than `eshell-test--max-wait-time', raise an
-error. MESSAGE is an optional message to use if this times out."
- (let ((start (current-time))
- (message (or message "timed out waiting for condition")))
- (while (not (funcall predicate))
- (when (> (float-time (time-since start))
- eshell-test--max-wait-time)
- (error message))
- (sit-for 0.1))))
-
-(defun eshell-wait-for-subprocess (&optional all)
- "Wait until there is no interactive subprocess running in Eshell.
-If ALL is non-nil, wait until there are no Eshell subprocesses at
-all running.
-
-If this takes longer than `eshell-test--max-wait-time',
-raise an error."
- (eshell-wait-for
- (lambda ()
- (not (if all eshell-process-list (eshell-interactive-process-p))))))
-
-(defun eshell-get-debug-logs ()
- "Get debug command logs for displaying on test failures."
- (when (get-buffer eshell-debug-command-buffer)
- (let ((separator (make-string 40 ?-)))
- (with-current-buffer eshell-debug-command-buffer
- (string-replace "\f" separator (buffer-string))))))
-
-(defun eshell-insert-command (command &optional func)
- "Insert a COMMAND at the end of the buffer.
-After inserting, call FUNC. If FUNC is nil, instead call
-`eshell-send-input'."
- (goto-char eshell-last-output-end)
- (insert-and-inherit command)
- (funcall (or func 'eshell-send-input)))
-
-(defun eshell-last-input ()
- "Return the input of the last Eshell command."
- (buffer-substring-no-properties
- eshell-last-input-start eshell-last-input-end))
-
-(defun eshell-last-output ()
- "Return the output of the last Eshell command."
- (buffer-substring-no-properties
- (eshell-beginning-of-output) (eshell-end-of-output)))
-
-(defun eshell-test-file-string (file)
- "Return the contents of FILE as a string."
- (with-temp-buffer
- (insert-file-contents file)
- (buffer-string)))
-
-(defun eshell-match-output (regexp)
- "Test whether the output of the last command matches REGEXP."
- (string-match-p regexp (eshell-last-output)))
-
-(defun eshell-match-output--explainer (regexp)
- "Explain the result of `eshell-match-output'."
- `(mismatched-output
- (command ,(eshell-last-input))
- (output ,(eshell-last-output))
- (regexp ,regexp)))
-
-(put 'eshell-match-output 'ert-explainer #'eshell-match-output--explainer)
-
-(defun eshell-match-command-output (command regexp &optional func
- ignore-errors)
- "Insert a COMMAND at the end of the buffer and match the output with REGEXP.
-FUNC is the function to call after inserting the text (see
-`eshell-insert-command').
-
-If IGNORE-ERRORS is non-nil, ignore any errors signaled when
-inserting the command."
- (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
- (let ((debug-on-error (and (not ignore-errors) debug-on-error)))
- (eshell-insert-command command func))
- (eshell-wait-for-subprocess)
- (should (eshell-match-output regexp))))
-
-(defvar eshell-history-file-name)
-
-(defun eshell-test-command-result (command)
- "Like `eshell-command-result', but not using HOME."
- (ert-with-temp-directory eshell-directory-name
- (let ((eshell-history-file-name nil)
- ;; Enable process debug instrumentation. See
- ;; `with-temp-eshell' above.
- (eshell-debug-command (cons 'process eshell-debug-command)))
- (eshell-command-result command))))
-
-(defun eshell-command-result--equal (_command actual expected)
- "Compare the ACTUAL result of a COMMAND with its EXPECTED value."
- (equal actual expected))
-
-(defun eshell-command-result--equal-explainer (command actual expected)
- "Explain the result of `eshell-command-result--equal'."
- `(nonequal-result
- (command ,command)
- (result ,actual)
- (expected ,expected)))
-
-(put 'eshell-command-result--equal 'ert-explainer
- #'eshell-command-result--equal-explainer)
-
-(defun eshell-command-result-equal (command result)
- "Execute COMMAND non-interactively and compare it to RESULT."
- (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
- (let ((eshell-module-loading-messages nil))
- (should (eshell-command-result--equal
- command
- (eshell-test-command-result command)
- result)))))
-
-(defun eshell-command-result--match (_command regexp actual)
- "Compare the ACTUAL result of a COMMAND with REGEXP."
- (string-match regexp actual))
-
-(defun eshell-command-result--match-explainer (command regexp actual)
- "Explain the result of `eshell-command-result--match'."
- `(mismatched-result
- (command ,command)
- (result ,actual)
- (regexp ,regexp)))
-
-(put 'eshell-command-result--match 'ert-explainer
- #'eshell-command-result--match-explainer)
-
-(defun eshell-command-result-match (command regexp)
- "Execute COMMAND non-interactively and compare it to REGEXP."
- (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
- (let ((eshell-module-loading-messages nil))
- (should (eshell-command-result--match
- command regexp
- (eshell-test-command-result command))))))
-
-(provide 'eshell-tests-helpers)
-
-;;; eshell-tests-helpers.el ends here
(require 'ert)
(require 'ert-x)
(require 'esh-mode)
+(require 'ert-x)
(require 'eshell)
(require 'eshell-tests-helpers
- (expand-file-name "eshell-tests-helpers"
- (file-name-directory (or load-file-name
- default-directory))))
+ (ert-resource-file "eshell-tests-helpers"))
(defvar eshell-test-value nil)
(defvar eshell-command-output)
--- /dev/null
+;;; eshell-tests-helpers.el --- Eshell test suite helpers -*- lexical-binding:t -*-
+
+;; Copyright (C) 1999-2025 Free Software Foundation, Inc.
+
+;; Author: John Wiegley <johnw@gnu.org>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Eshell test suite helpers.
+
+;;; Code:
+
+(require 'ert)
+(require 'ert-x)
+(require 'esh-mode)
+(require 'eshell)
+
+(defvar eshell-aliases-file nil)
+(defvar eshell-command-aliases-list nil)
+(defvar eshell-history-file-name nil)
+(defvar eshell-last-dir-ring-file-name nil)
+
+(defvar eshell-test--max-wait-time 5
+ "The maximum amount of time to wait for a condition to resolve, in seconds.
+See `eshell-wait-for'.")
+
+(defun eshell-tests-remote-accessible-p ()
+ "Return if a test involving remote files can proceed.
+If using this function, be sure to load `tramp' near the
+beginning of the test file."
+ (ignore-errors
+ (and
+ (file-remote-p ert-remote-temporary-file-directory)
+ (file-directory-p ert-remote-temporary-file-directory)
+ (file-writable-p ert-remote-temporary-file-directory))))
+
+(defmacro with-temp-eshell-settings (&rest body)
+ "Configure Eshell to leave no trace behind, and then evaluate BODY."
+ (declare (indent 0))
+ `(ert-with-temp-directory eshell-directory-name
+ (let (;; We want no history file, so prevent Eshell from falling
+ ;; back on $HISTFILE.
+ (process-environment (cons "HISTFILE" process-environment))
+ ;; Enable process debug instrumentation. We may be able to
+ ;; remove this eventually once we're confident that all the
+ ;; process bugs have been worked out. (At that point, we can
+ ;; just enable this selectively when needed.) See also
+ ;; `eshell-test-command-result' below.
+ (eshell-debug-command (cons 'process eshell-debug-command))
+ (eshell-aliases-file nil)
+ (eshell-command-aliases-list nil)
+ (eshell-history-file-name nil)
+ (eshell-last-dir-ring-file-name nil)
+ (eshell-module-loading-messages nil))
+ ,@body)))
+
+(defmacro with-temp-eshell (&rest body)
+ "Evaluate BODY in a temporary Eshell buffer."
+ (declare (indent 0))
+ `(save-current-buffer
+ (with-temp-eshell-settings
+ (let ((eshell-buffer (eshell t)))
+ (unwind-protect
+ (with-current-buffer eshell-buffer
+ ,@body)
+ (let (kill-buffer-query-functions)
+ (kill-buffer eshell-buffer)))))))
+
+(defmacro eshell-with-temp-buffer (bufname text &rest body)
+ "Create a temporary buffer containing TEXT and evaluate BODY there.
+BUFNAME will be set to the name of the temporary buffer."
+ (declare (indent 2))
+ `(with-temp-buffer
+ (insert ,text)
+ (rename-buffer "eshell-temp-buffer" t)
+ (let ((,bufname (buffer-name)))
+ ,@body)))
+
+(defun eshell-wait-for (predicate &optional message)
+ "Wait until PREDICATE returns non-nil.
+If this takes longer than `eshell-test--max-wait-time', raise an
+error. MESSAGE is an optional message to use if this times out."
+ (let ((start (current-time))
+ (message (or message "timed out waiting for condition")))
+ (while (not (funcall predicate))
+ (when (> (float-time (time-since start))
+ eshell-test--max-wait-time)
+ (error message))
+ (sit-for 0.1))))
+
+(defun eshell-wait-for-subprocess (&optional all)
+ "Wait until there is no interactive subprocess running in Eshell.
+If ALL is non-nil, wait until there are no Eshell subprocesses at
+all running.
+
+If this takes longer than `eshell-test--max-wait-time',
+raise an error."
+ (eshell-wait-for
+ (lambda ()
+ (not (if all eshell-process-list (eshell-interactive-process-p))))))
+
+(defun eshell-get-debug-logs ()
+ "Get debug command logs for displaying on test failures."
+ (when (get-buffer eshell-debug-command-buffer)
+ (let ((separator (make-string 40 ?-)))
+ (with-current-buffer eshell-debug-command-buffer
+ (string-replace "\f" separator (buffer-string))))))
+
+(defun eshell-insert-command (command &optional func)
+ "Insert a COMMAND at the end of the buffer.
+After inserting, call FUNC. If FUNC is nil, instead call
+`eshell-send-input'."
+ (goto-char eshell-last-output-end)
+ (insert-and-inherit command)
+ (funcall (or func 'eshell-send-input)))
+
+(defun eshell-last-input ()
+ "Return the input of the last Eshell command."
+ (buffer-substring-no-properties
+ eshell-last-input-start eshell-last-input-end))
+
+(defun eshell-last-output ()
+ "Return the output of the last Eshell command."
+ (buffer-substring-no-properties
+ (eshell-beginning-of-output) (eshell-end-of-output)))
+
+(defun eshell-test-file-string (file)
+ "Return the contents of FILE as a string."
+ (with-temp-buffer
+ (insert-file-contents file)
+ (buffer-string)))
+
+(defun eshell-match-output (regexp)
+ "Test whether the output of the last command matches REGEXP."
+ (string-match-p regexp (eshell-last-output)))
+
+(defun eshell-match-output--explainer (regexp)
+ "Explain the result of `eshell-match-output'."
+ `(mismatched-output
+ (command ,(eshell-last-input))
+ (output ,(eshell-last-output))
+ (regexp ,regexp)))
+
+(put 'eshell-match-output 'ert-explainer #'eshell-match-output--explainer)
+
+(defun eshell-match-command-output (command regexp &optional func
+ ignore-errors)
+ "Insert a COMMAND at the end of the buffer and match the output with REGEXP.
+FUNC is the function to call after inserting the text (see
+`eshell-insert-command').
+
+If IGNORE-ERRORS is non-nil, ignore any errors signaled when
+inserting the command."
+ (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
+ (let ((debug-on-error (and (not ignore-errors) debug-on-error)))
+ (eshell-insert-command command func))
+ (eshell-wait-for-subprocess)
+ (should (eshell-match-output regexp))))
+
+(defvar eshell-history-file-name)
+
+(defun eshell-test-command-result (command)
+ "Like `eshell-command-result', but not using HOME."
+ (ert-with-temp-directory eshell-directory-name
+ (let ((eshell-history-file-name nil)
+ ;; Enable process debug instrumentation. See
+ ;; `with-temp-eshell' above.
+ (eshell-debug-command (cons 'process eshell-debug-command)))
+ (eshell-command-result command))))
+
+(defun eshell-command-result--equal (_command actual expected)
+ "Compare the ACTUAL result of a COMMAND with its EXPECTED value."
+ (equal actual expected))
+
+(defun eshell-command-result--equal-explainer (command actual expected)
+ "Explain the result of `eshell-command-result--equal'."
+ `(nonequal-result
+ (command ,command)
+ (result ,actual)
+ (expected ,expected)))
+
+(put 'eshell-command-result--equal 'ert-explainer
+ #'eshell-command-result--equal-explainer)
+
+(defun eshell-command-result-equal (command result)
+ "Execute COMMAND non-interactively and compare it to RESULT."
+ (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
+ (let ((eshell-module-loading-messages nil))
+ (should (eshell-command-result--equal
+ command
+ (eshell-test-command-result command)
+ result)))))
+
+(defun eshell-command-result--match (_command regexp actual)
+ "Compare the ACTUAL result of a COMMAND with REGEXP."
+ (string-match regexp actual))
+
+(defun eshell-command-result--match-explainer (command regexp actual)
+ "Explain the result of `eshell-command-result--match'."
+ `(mismatched-result
+ (command ,command)
+ (result ,actual)
+ (regexp ,regexp)))
+
+(put 'eshell-command-result--match 'ert-explainer
+ #'eshell-command-result--match-explainer)
+
+(defun eshell-command-result-match (command regexp)
+ "Execute COMMAND non-interactively and compare it to REGEXP."
+ (ert-info (#'eshell-get-debug-logs :prefix "Command logs: ")
+ (let ((eshell-module-loading-messages nil))
+ (should (eshell-command-result--match
+ command regexp
+ (eshell-test-command-result command))))))
+
+(provide 'eshell-tests-helpers)
+
+;;; eshell-tests-helpers.el ends here
projects / emacs.git / commitdiff