summaryrefslogtreecommitdiff
path: root/test/lisp/vc/ediff-diff-tests.el
diff options
context:
space:
mode:
authorPhilipp Stephani <phst@google.com>2017-03-03 18:36:08 +0100
committerPhilipp Stephani <phst@google.com>2017-04-04 11:37:10 +0200
commitf4b50dad8d5eade04f495c693c0bca46060b25cb (patch)
tree0738ac90a39540d2d2affc066ce625471e3c0298 /test/lisp/vc/ediff-diff-tests.el
parent2c68192c6b029bb839193c81cf2a16dad26305c6 (diff)
downloademacs-f4b50dad8d5eade04f495c693c0bca46060b25cb.tar.gz
emacs-f4b50dad8d5eade04f495c693c0bca46060b25cb.tar.bz2
emacs-f4b50dad8d5eade04f495c693c0bca46060b25cb.zip
Make ediff handle remote and quoted file names
Quoted file names need to be unquoted before passed to subprocesses (Bug#25950). * lisp/vc/ediff-diff.el (ediff-exec-process): Handle remote and quoted file names. * test/lisp/vc/ediff-diff-tests.el (ediff-diff-tests--ediff-exec-process--quoted-file): Add unit test.
Diffstat (limited to 'test/lisp/vc/ediff-diff-tests.el')
-rw-r--r--test/lisp/vc/ediff-diff-tests.el44
1 files changed, 44 insertions, 0 deletions
diff --git a/test/lisp/vc/ediff-diff-tests.el b/test/lisp/vc/ediff-diff-tests.el
new file mode 100644
index 00000000000..aacc8bfed2b
--- /dev/null
+++ b/test/lisp/vc/ediff-diff-tests.el
@@ -0,0 +1,44 @@
+;;; ediff-diff-tests.el --- Unit tests for ediff-diff.el -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2017 Free Software Foundation, Inc.
+
+;; Author: Philipp Stephani <phst@google.com>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Unit tests for lisp/vc/ediff-diff.el.
+
+;;; Code:
+
+(require 'ediff-diff)
+
+(require 'cl-lib)
+(require 'ert)
+
+(ert-deftest ediff-diff-tests--ediff-exec-process--quoted-file ()
+ "Check that Bug#25950 is fixed."
+ (cl-letf* ((call-process-args ())
+ ((symbol-function #'call-process)
+ (lambda (&rest args) (push args call-process-args) 0)))
+ (with-temp-buffer
+ (ediff-exec-process "diff" (current-buffer) :synchronous ""
+ "/:/a" "/:/b")
+ (should (equal call-process-args
+ `(("diff" nil ,(current-buffer) nil "/a" "/b")))))))
+
+;;; ediff-diff-tests.el ends here