aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2018-08-04 12:05:28 +0200
committerMichael Albinus2018-08-04 12:05:28 +0200
commitb9e2a91ec5b005c624eaca32064dc60b5f3131f9 (patch)
tree81f02b92625ea1450375b943e0e12d1d8b2cbd50 /test
parent5dc3d0a9b0594fee80a03e78fee109ebd0934dcf (diff)
downloademacs-b9e2a91ec5b005c624eaca32064dc60b5f3131f9.tar.gz
emacs-b9e2a91ec5b005c624eaca32064dc60b5f3131f9.zip
Rename Tramp method "owncloud" to "nextcloud"
In the spirit of freedom, "nextcloud" is preferred over "owncloud". * doc/misc/tramp.texi (Quick Start Guide, GVFS based methods): * etc/NEWS: Rename "owncloud" method to "nextcloud". * lisp/net/tramp-gvfs.el (tramp-gvfs-methods, tramp-goa-methods) (tramp-gvfs-url-file-name, tramp-gvfs-handler-mounted-unmounted) (tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec) (tramp-get-goa-accounts): Use "nextcloud" instead of "owncloud". (tramp-gvfs-nextcloud-default-prefix) (tramp-gvfs-nextcloud-default-prefix-regexp): Rename them. Adapt all callees. * test/lisp/net/tramp-tests.el (tramp--test-nextcloud-p): Rename from `tramp--test-owncloud-p'. (tramp-test11-copy-file, tramp-test12-rename-file): Use it.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 5c5eff8798d..c0298bb7090 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2182,7 +2182,7 @@ This checks also `file-name-as-directory', `file-name-directory',
2182 (unwind-protect 2182 (unwind-protect
2183 ;; FIXME: This fails on my QNAP server, see 2183 ;; FIXME: This fails on my QNAP server, see
2184 ;; /share/Web/owncloud/data/owncloud.log 2184 ;; /share/Web/owncloud/data/owncloud.log
2185 (unless (tramp--test-owncloud-p) 2185 (unless (tramp--test-nextcloud-p)
2186 (write-region "foo" nil source) 2186 (write-region "foo" nil source)
2187 (should (file-exists-p source)) 2187 (should (file-exists-p source))
2188 (make-directory target) 2188 (make-directory target)
@@ -2205,7 +2205,7 @@ This checks also `file-name-as-directory', `file-name-directory',
2205 (unwind-protect 2205 (unwind-protect
2206 ;; FIXME: This fails on my QNAP server, see 2206 ;; FIXME: This fails on my QNAP server, see
2207 ;; /share/Web/owncloud/data/owncloud.log 2207 ;; /share/Web/owncloud/data/owncloud.log
2208 (unless (and (tramp--test-owncloud-p) 2208 (unless (and (tramp--test-nextcloud-p)
2209 (or (not (file-remote-p source)) 2209 (or (not (file-remote-p source))
2210 (not (file-remote-p target)))) 2210 (not (file-remote-p target))))
2211 (make-directory source) 2211 (make-directory source)
@@ -2231,7 +2231,7 @@ This checks also `file-name-as-directory', `file-name-directory',
2231 ;; FIXME: This fails on my QNAP server, see 2231 ;; FIXME: This fails on my QNAP server, see
2232 ;; /share/Web/owncloud/data/owncloud.log 2232 ;; /share/Web/owncloud/data/owncloud.log
2233 (unless 2233 (unless
2234 (and (tramp--test-owncloud-p) (not (file-remote-p source))) 2234 (and (tramp--test-nextcloud-p) (not (file-remote-p source)))
2235 (make-directory source) 2235 (make-directory source)
2236 (should (file-directory-p source)) 2236 (should (file-directory-p source))
2237 (write-region "foo" nil (expand-file-name "foo" source)) 2237 (write-region "foo" nil (expand-file-name "foo" source))
@@ -2320,7 +2320,7 @@ This checks also `file-name-as-directory', `file-name-directory',
2320 (unwind-protect 2320 (unwind-protect
2321 ;; FIXME: This fails on my QNAP server, see 2321 ;; FIXME: This fails on my QNAP server, see
2322 ;; /share/Web/owncloud/data/owncloud.log 2322 ;; /share/Web/owncloud/data/owncloud.log
2323 (unless (tramp--test-owncloud-p) 2323 (unless (tramp--test-nextcloud-p)
2324 (make-directory source) 2324 (make-directory source)
2325 (should (file-directory-p source)) 2325 (should (file-directory-p source))
2326 (write-region "foo" nil (expand-file-name "foo" source)) 2326 (write-region "foo" nil (expand-file-name "foo" source))
@@ -2344,7 +2344,7 @@ This checks also `file-name-as-directory', `file-name-directory',
2344 (unwind-protect 2344 (unwind-protect
2345 ;; FIXME: This fails on my QNAP server, see 2345 ;; FIXME: This fails on my QNAP server, see
2346 ;; /share/Web/owncloud/data/owncloud.log 2346 ;; /share/Web/owncloud/data/owncloud.log
2347 (unless (tramp--test-owncloud-p) 2347 (unless (tramp--test-nextcloud-p)
2348 (make-directory source) 2348 (make-directory source)
2349 (should (file-directory-p source)) 2349 (should (file-directory-p source))
2350 (write-region "foo" nil (expand-file-name "foo" source)) 2350 (write-region "foo" nil (expand-file-name "foo" source))
@@ -4427,10 +4427,10 @@ This does not support external Emacs calls."
4427 (string-equal 4427 (string-equal
4428 "mock" (file-remote-p tramp-test-temporary-file-directory 'method))) 4428 "mock" (file-remote-p tramp-test-temporary-file-directory 'method)))
4429 4429
4430(defun tramp--test-owncloud-p () 4430(defun tramp--test-nextcloud-p ()
4431 "Check, whether the owncloud method is used." 4431 "Check, whether the nextcloud method is used."
4432 (string-equal 4432 (string-equal
4433 "owncloud" (file-remote-p tramp-test-temporary-file-directory 'method))) 4433 "nextcloud" (file-remote-p tramp-test-temporary-file-directory 'method)))
4434 4434
4435(defun tramp--test-rsync-p () 4435(defun tramp--test-rsync-p ()
4436 "Check, whether the rsync method is used. 4436 "Check, whether the rsync method is used.