aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2019-10-31 11:13:13 +0100
committerMichael Albinus2019-10-31 11:13:13 +0100
commitbdb33af39d32cfb0bb23f18eb34775a30e2ff62d (patch)
treeeed9633f5519abb8c10d85d4583fb25260df64af /test/lisp/net
parente168bb73865f64cc67f80f8b2599c826cbf9e957 (diff)
downloademacs-bdb33af39d32cfb0bb23f18eb34775a30e2ff62d.tar.gz
emacs-bdb33af39d32cfb0bb23f18eb34775a30e2ff62d.zip
Fix some minor Tramp problems
* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection): Check, that `tramp-password-save-function' is a function. * lisp/net/tramp-smb.el (tramp-smb-handle-file-system-info): Check, that there is a share. * lisp/net/tramp.el (outline-regexp): Declare. (tramp-get-debug-buffer): Let-bind `signal-hook-function'. * test/lisp/net/tramp-tests.el (tramp-test04-substitute-in-file-name): Skip some tests for Emacs 24 and 25; they let Emacs crash.
Diffstat (limited to 'test/lisp/net')
-rw-r--r--test/lisp/net/tramp-tests.el64
1 files changed, 34 insertions, 30 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c56c7dbbca2..baebae17e1f 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1956,36 +1956,40 @@ properly. BODY shall not contain a timeout."
1956 (substitute-in-file-name "/method:host:/:/path//foo") 1956 (substitute-in-file-name "/method:host:/:/path//foo")
1957 "/method:host:/:/path//foo")) 1957 "/method:host:/:/path//foo"))
1958 1958
1959 (should 1959 ;; Forwhatever reasons, the following tests let Emacs crash for
1960 (string-equal (substitute-in-file-name "/method:host://~foo") "/~foo")) 1960 ;; Emacs 24 and Emacs 25, occasionally. No idea what's up.
1961 (should 1961 (when (or (tramp--test-emacs26-p) (tramp--test-emacs27-p))
1962 (string-equal 1962 (should
1963 (substitute-in-file-name "/method:host:/~foo") "/method:host:/~foo")) 1963 (string-equal (substitute-in-file-name "/method:host://~foo") "/~foo"))
1964 (should 1964 (should
1965 (string-equal 1965 (string-equal
1966 (substitute-in-file-name "/method:host:/path//~foo") "/~foo")) 1966 (substitute-in-file-name "/method:host:/~foo") "/method:host:/~foo"))
1967 ;; (substitute-in-file-name "/path/~foo") expands only for a local 1967 (should
1968 ;; user "foo" to "/~foo"". Otherwise, it doesn't expand. 1968 (string-equal
1969 (should 1969 (substitute-in-file-name "/method:host:/path//~foo") "/~foo"))
1970 (string-equal 1970 ;; (substitute-in-file-name "/path/~foo") expands only for a local
1971 (substitute-in-file-name 1971 ;; user "foo" to "/~foo"". Otherwise, it doesn't expand.
1972 "/method:host:/path/~foo") "/method:host:/path/~foo")) 1972 (should
1973 ;; Quoting local part. 1973 (string-equal
1974 (should 1974 (substitute-in-file-name
1975 (string-equal 1975 "/method:host:/path/~foo") "/method:host:/path/~foo"))
1976 (substitute-in-file-name "/method:host:/://~foo") 1976 ;; Quoting local part.
1977 "/method:host:/://~foo")) 1977 (should
1978 (should 1978 (string-equal
1979 (string-equal 1979 (substitute-in-file-name "/method:host:/://~foo")
1980 (substitute-in-file-name "/method:host:/:/~foo") "/method:host:/:/~foo")) 1980 "/method:host:/://~foo"))
1981 (should 1981 (should
1982 (string-equal 1982 (string-equal
1983 (substitute-in-file-name 1983 (substitute-in-file-name
1984 "/method:host:/:/path//~foo") "/method:host:/:/path//~foo")) 1984 "/method:host:/:/~foo") "/method:host:/:/~foo"))
1985 (should 1985 (should
1986 (string-equal 1986 (string-equal
1987 (substitute-in-file-name 1987 (substitute-in-file-name
1988 "/method:host:/:/path/~foo") "/method:host:/:/path/~foo")) 1988 "/method:host:/:/path//~foo") "/method:host:/:/path//~foo"))
1989 (should
1990 (string-equal
1991 (substitute-in-file-name
1992 "/method:host:/:/path/~foo") "/method:host:/:/path/~foo")))
1989 1993
1990 (let (process-environment) 1994 (let (process-environment)
1991 (should 1995 (should