[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f32ce2e38c: Adapt tramp-tests.el
From: |
Michael Albinus |
Subject: |
master f32ce2e38c: Adapt tramp-tests.el |
Date: |
Fri, 13 Jan 2023 13:41:18 -0500 (EST) |
branch: master
commit f32ce2e38cfc99d869a3ae07e912d7ce33772f12
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Adapt tramp-tests.el
* test/lisp/net/tramp-tests.el (tramp--test-container-p):
Rename from `tramp--test-docker-p'. Handle also "podman" method.
Adapt callees.
---
test/lisp/net/tramp-tests.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index dd3de27d3b..918929f55e 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5469,7 +5469,7 @@ INPUT, if non-nil, is a string sent to the process."
(format "%s\n" (file-name-nondirectory tmp-name)))
(should
(string-match-p
- ;; Some shells echo, for example the "adb" or "docker" methods.
+ ;; Some shells echo, for example the "adb" or container methods.
(rx
bos (** 1 2 (literal (file-name-nondirectory tmp-name)) "\n")
eos)
@@ -6567,11 +6567,12 @@ This is used in tests which we don't want to tag
"Check, whether the remote directory is encrypted."
(tramp-crypt-file-name-p ert-remote-temporary-file-directory))
-(defun tramp--test-docker-p ()
- "Check, whether the docker method is used.
+(defun tramp--test-container-p ()
+ "Check, whether a container method is used.
This does not support some special file names."
- (string-equal
- "docker" (file-remote-p ert-remote-temporary-file-directory 'method)))
+ (string-match-p
+ (rx bol (| "docker" "podman") eol)
+ (file-remote-p ert-remote-temporary-file-directory 'method)))
(defun tramp--test-expensive-test-p ()
"Whether expensive tests are run.
@@ -6945,7 +6946,7 @@ This requires restrictions of file name syntax."
(let ((files
(list
(cond ((or (tramp--test-ange-ftp-p)
- (tramp--test-docker-p)
+ (tramp--test-container-p)
(tramp--test-gvfs-p)
(tramp--test-rclone-p)
(tramp--test-sudoedit-p)
@@ -7003,7 +7004,7 @@ This requires restrictions of file name syntax."
"Check UTF8 encoding in file names and file contents."
(skip-unless (tramp--test-enabled))
(skip-unless (not (getenv "EMACS_HYDRA_CI"))) ; SLOW ~ 620s
- (skip-unless (not (tramp--test-docker-p)))
+ (skip-unless (not (tramp--test-container-p)))
(skip-unless (not (tramp--test-rsync-p)))
(skip-unless (not (tramp--test-windows-nt-and-out-of-band-p)))
(skip-unless (not (tramp--test-ksh-p)))
@@ -7123,7 +7124,7 @@ process sentinels. They shall not disturb each other."
'(:unstable)))
(skip-unless (tramp--test-enabled))
(skip-unless (tramp--test-supports-processes-p))
- (skip-unless (not (tramp--test-docker-p)))
+ (skip-unless (not (tramp--test-container-p)))
(skip-unless (not (tramp--test-telnet-p)))
(skip-unless (not (tramp--test-sshfs-p)))
(skip-unless (not (tramp--test-windows-nt-p)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f32ce2e38c: Adapt tramp-tests.el,
Michael Albinus <=