[devscripts] 02/02: uscan: add test for s<...> <...>g etc.

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit c0b48901b31e2c7eed6dcc1835c50574e6c1604b
Author: Osamu Aoki <osamu at debian.org>
Date:   Sat Feb 13 13:27:09 2016 +0900

    uscan: add test for s<...> <...>g etc.
    
    Test for:
      s<...><...>g
      s<...> <...>g
      s<...>	<...>g
      s[...][...]g
      s{...}{...}g
---
 debian/changelog       |  2 ++
 test/test_uscan_mangle | 44 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9037af..e988485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ devscripts (2.16.2) UNRELEASED; urgency=medium
   [ Osamu Aoki ]
   * uscan:
     + Print proper warnings for bad rules.  Closes: #814049
+    + Fix glitches around rules such as "s<...> <...>g" and add their
+      tests.
 
  -- Osamu Aoki <osamu at debian.org>  Sat, 13 Feb 2016 22:10:05 +0900
 
diff --git a/test/test_uscan_mangle b/test/test_uscan_mangle
index 893411a..94a69bc 100755
--- a/test/test_uscan_mangle
+++ b/test/test_uscan_mangle
@@ -889,8 +889,48 @@ testWatch4WebNonNativeSig() {
     helperWatch
 }
 
-# test normal web page with sig(asc)
-testWatch4WebNonNativeSig() {
+# test normal web page with sig(asc) with < and >
+testWatch4WebNonNativeSigAngleBraket() {
+    WATCHVER=4
+    WATCHLINE='opts = "pgpsigurlmangle = s<(.*)><$1.asc>" \
+		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    helperWatch
+}
+
+# test normal web page with sig(asc) with < and > with space
+testWatch4WebNonNativeSigAngleBraketSpace() {
+    WATCHVER=4
+    WATCHLINE='opts = "pgpsigurlmangle = s<(.*)> <$1.asc>" \
+		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    helperWatch
+}
+
+# test normal web page with sig(asc) with < and > with tab
+testWatch4WebNonNativeSigAngleBraketTab() {
+    WATCHVER=4
+    WATCHLINE='opts = "pgpsigurlmangle = s<(.*)>	<$1.asc>" \
+		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    helperWatch
+}
+
+# test normal web page with sig(asc) with [ and ]
+testWatch4WebNonNativeSigSquareBraket() {
+    WATCHVER=4
+    WATCHLINE='opts = "pgpsigurlmangle = s[(.*)][$1.asc]" \
+		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    helperWatch
+}
+
+# test normal web page with sig(asc) with { and }
+testWatch4WebNonNativeSigCurlyBraket() {
+    WATCHVER=4
+    WATCHLINE='opts = "pgpsigurlmangle = s{(.*)}{$1.asc}" \
+		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'
+    helperWatch
+}
+
+# test normal web page with sig(asc) - auto
+testWatch4WebNonNativeSigAuto() {
     WATCHVER=4
     WATCHLINE='opts = "pgpmode = auto" \
 		@@@url@@@/ (?:.*)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git