diff options
| author | Eli Zaretskii | 2019-09-18 15:15:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-09-18 15:15:33 +0300 |
| commit | 98586c2fe62fd26bc9105a06b78d93446bd2a269 (patch) | |
| tree | 050613d5124dbff9c0962108826f0e90a6c3f12d /test | |
| parent | 7ff2eef926f933c79c3913c18f9403a4a987756b (diff) | |
| parent | ffcec7cd4be83d03c21e7378efc55911b33696b1 (diff) | |
| download | emacs-98586c2fe62fd26bc9105a06b78d93446bd2a269.tar.gz emacs-98586c2fe62fd26bc9105a06b78d93446bd2a269.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 1554d3b70b1..d7e0a045106 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -2412,9 +2412,7 @@ This checks also `file-name-as-directory', `file-name-directory', | |||
| 2412 | (unwind-protect | 2412 | (unwind-protect |
| 2413 | ;; FIXME: This fails on my QNAP server, see | 2413 | ;; FIXME: This fails on my QNAP server, see |
| 2414 | ;; /share/Web/owncloud/data/owncloud.log | 2414 | ;; /share/Web/owncloud/data/owncloud.log |
| 2415 | (unless (and (tramp--test-nextcloud-p) | 2415 | (unless (tramp--test-nextcloud-p) |
| 2416 | (or (not (file-remote-p source)) | ||
| 2417 | (not (file-remote-p target)))) | ||
| 2418 | (make-directory source) | 2416 | (make-directory source) |
| 2419 | (should (file-directory-p source)) | 2417 | (should (file-directory-p source)) |
| 2420 | (write-region "foo" nil (expand-file-name "foo" source)) | 2418 | (write-region "foo" nil (expand-file-name "foo" source)) |
| @@ -2437,8 +2435,7 @@ This checks also `file-name-as-directory', `file-name-directory', | |||
| 2437 | (unwind-protect | 2435 | (unwind-protect |
| 2438 | ;; FIXME: This fails on my QNAP server, see | 2436 | ;; FIXME: This fails on my QNAP server, see |
| 2439 | ;; /share/Web/owncloud/data/owncloud.log | 2437 | ;; /share/Web/owncloud/data/owncloud.log |
| 2440 | (unless | 2438 | (unless (tramp--test-nextcloud-p) |
| 2441 | (and (tramp--test-nextcloud-p) (not (file-remote-p source))) | ||
| 2442 | (make-directory source) | 2439 | (make-directory source) |
| 2443 | (should (file-directory-p source)) | 2440 | (should (file-directory-p source)) |
| 2444 | (write-region "foo" nil (expand-file-name "foo" source)) | 2441 | (write-region "foo" nil (expand-file-name "foo" source)) |