aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2016-12-07 21:18:29 +0900
committerTino Calancha2016-12-07 21:18:29 +0900
commitdea898dd49062903d79e925239673ec451627f6d (patch)
tree78a9a8e3e4e07a61a3a11be968bfa86e99cdf393
parent2c4970560fbb0d1efe95f8a002c181bc706c1a13 (diff)
downloademacs-dea898dd49062903d79e925239673ec451627f6d.tar.gz
emacs-dea898dd49062903d79e925239673ec451627f6d.zip
New test file for ediff
Fix previous commit. * test/lisp/vc/ediff-ptch-tests.el: New test.
-rw-r--r--test/lisp/vc/ediff-ptch-tests.el42
1 files changed, 42 insertions, 0 deletions
diff --git a/test/lisp/vc/ediff-ptch-tests.el b/test/lisp/vc/ediff-ptch-tests.el
new file mode 100644
index 00000000000..427423a7407
--- /dev/null
+++ b/test/lisp/vc/ediff-ptch-tests.el
@@ -0,0 +1,42 @@
1;;; ediff-ptch-tests.el --- Tests for ediff-ptch.el
2
3;; Copyright (C) 2016 Free Software Foundation, Inc.
4
5;; Author: Tino Calancha <tino.calancha@gmail.com>
6
7;; This program is free software: you can redistribute it and/or
8;; modify it under the terms of the GNU General Public License as
9;; published by the Free Software Foundation, either version 3 of the
10;; License, or (at your option) any later version.
11;;
12;; This program is distributed in the hope that it will be useful, but
13;; WITHOUT ANY WARRANTY; without even the implied warranty of
14;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15;; General Public License for more details.
16;;
17;; You should have received a copy of the GNU General Public License
18;; along with this program. If not, see `http://www.gnu.org/licenses/'.
19
20;;; Code:
21
22(require 'ert)
23(require 'ediff-ptch)
24
25(ert-deftest ibuffer-test-bug25010 ()
26 "Test for http://debbugs.gnu.org/25010 ."
27 (with-temp-buffer
28 (insert "diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
29index 6a07f80..6e8e947 100644
30--- a/lisp/vc/ediff-ptch.el
31+++ b/lisp/vc/ediff-ptch.el
32@@ -120,11 +120,12 @@ ediff-patch-default-directory
33")
34 (goto-char (point-min))
35 (let ((filename
36 (progn
37 (re-search-forward ediff-context-diff-label-regexp nil t)
38 (match-string 1))))
39 (should-not (string-suffix-p "@@" filename)))))
40
41(provide 'ediff-ptch-tests)
42;;; ediff-ptch-tests.el ends here