diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
| commit | a8dd976aa5299060ee3670f8d693887960aa6ad8 (patch) | |
| tree | c805ea51cdf387c43e9aa2a99c502e7e44810418 /test/lisp/net | |
| parent | 91b263e76f5ce170c1c8cbc34a2e7614c32612b8 (diff) | |
| parent | 9fb185aff7b1f36c30bd157ec446d9bad104d1ee (diff) | |
| download | emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.tar.gz emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.tar.bz2 emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.zip | |
Merge from origin/emacs-25
9fb185a shr-tag-video bug fix
6300655 Minor fixes in tramp-tests.el
50575b1 Ensure redisplay when 'truncate-lines' is set
0d9e80d Fix a doc string of 'transient-mark-mode'
0000ae5 MS-Windows followup to latest gnulib update
4bc5e02 Spelling fix
f1093f7 Do secure signed Bcc handling
Diffstat (limited to 'test/lisp/net')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 5938ada8486..f0725847699 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1424,6 +1424,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should-not (get-buffer-window (current-buffer) t)) ;; Second run. The output must be appended. + (goto-char (point-max)) (should (zerop (process-file "ls" nil t t fnnd))) ;; `ls' could produce colorized output. (goto-char (point-min)) @@ -1652,8 +1653,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (error (vc-register nil (list (car vc-handled-backends) - (list (file-name-nondirectory tmp-name2))))))) - (should (vc-registered tmp-name2))) + (list (file-name-nondirectory tmp-name2)))))) + (should (vc-registered (file-name-nondirectory tmp-name2))))) ;; Cleanup. (ignore-errors (delete-directory tmp-name1 'recursive))))) |