[lintian] 01/01: t: Extract changelog syntax error test into debs suite
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 9b0c4b3823d878dca72053bb4ce82a12c556adac
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 9 10:58:56 2016 +0000
t: Extract changelog syntax error test into debs suite
This avoids a FTBFS with dpkg 1.18.5, which is more strict with in its
changelog parsing.
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/debs/changelog-file-syntax/Makefile | 12 ++++++++++++
t/debs/changelog-file-syntax/changelog.in | 22 ++++++++++++++++++++++
t/debs/changelog-file-syntax/desc | 5 +++++
t/debs/changelog-file-syntax/tags | 2 ++
.../debian/debian/changelog.in | 4 ++--
t/tests/changelog-file-general/desc | 1 -
t/tests/changelog-file-general/tags | 2 --
7 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/t/debs/changelog-file-syntax/Makefile b/t/debs/changelog-file-syntax/Makefile
new file mode 100644
index 0000000..794d823
--- /dev/null
+++ b/t/debs/changelog-file-syntax/Makefile
@@ -0,0 +1,12 @@
+name = changelog-file-syntax
+
+all:
+
+ mkdir -p root/usr/share/doc/$(name)
+ install -m0644 copyright changelog root/usr/share/doc/$(name)
+ gzip -9n root/usr/share/doc/$(name)/changelog
+ create-deb --root root/ -o $(name).deb control
+
+clean:
+ rm -f *.tar.gz *.deb debian-binary md5sums
+ rm -rf root/
diff --git a/t/debs/changelog-file-syntax/changelog.in b/t/debs/changelog-file-syntax/changelog.in
new file mode 100644
index 0000000..28d7dab
--- /dev/null
+++ b/t/debs/changelog-file-syntax/changelog.in
@@ -0,0 +1,22 @@
+{$source} (1.0) unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: {$testname}
+
+ -- {$author} {$date}
+
+{$source} (0.1) unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: {$testname}
+
+ -- {$author} Sat, 09 Apr 2016 10:56:49 +0000
+
+{$source} () unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: {$testname}
+
+ * Suppress "should close ITP bug" messages. (Closes: #123456)
+
+ -- {$author} Sat, 02 Apr 2016 10:56:49 +0000
diff --git a/t/debs/changelog-file-syntax/desc b/t/debs/changelog-file-syntax/desc
new file mode 100644
index 0000000..2c59fc4
--- /dev/null
+++ b/t/debs/changelog-file-syntax/desc
@@ -0,0 +1,5 @@
+Testname: changelog-file-syntax
+Sequence: 6000
+Version: 1.0
+Description: Test for syntax errors in changelogs
+Test-For: syntax-error-in-debian-changelog
diff --git a/t/debs/changelog-file-syntax/tags b/t/debs/changelog-file-syntax/tags
new file mode 100644
index 0000000..8d413ea
--- /dev/null
+++ b/t/debs/changelog-file-syntax/tags
@@ -0,0 +1,2 @@
+W: changelog-file-syntax: syntax-error-in-debian-changelog line 15 "badly formatted heading line"
+W: changelog-file-syntax: syntax-error-in-debian-changelog line 17 "found change data where expected next heading or eof"
diff --git a/t/tests/changelog-file-general/debian/debian/changelog.in b/t/tests/changelog-file-general/debian/debian/changelog.in
index 087e909..6b08699 100644
--- a/t/tests/changelog-file-general/debian/debian/changelog.in
+++ b/t/tests/changelog-file-general/debian/debian/changelog.in
@@ -28,9 +28,9 @@
-- Unknown <unknown@unknown> {$date}
-{$source} () unstable; urgency=low
+{$source} (0.1) unstable; urgency=low
- * Syntax error here.
+ * Used to be a syntax error here.
-- {$author} {$date}
diff --git a/t/tests/changelog-file-general/desc b/t/tests/changelog-file-general/desc
index a1292eb..6139755 100644
--- a/t/tests/changelog-file-general/desc
+++ b/t/tests/changelog-file-general/desc
@@ -13,4 +13,3 @@ Test-For:
latest-debian-changelog-entry-without-new-date
latest-debian-changelog-entry-without-new-version
possible-missing-colon-in-closes
- syntax-error-in-debian-changelog
diff --git a/t/tests/changelog-file-general/tags b/t/tests/changelog-file-general/tags
index 569f109..cf0d7c1 100644
--- a/t/tests/changelog-file-general/tags
+++ b/t/tests/changelog-file-general/tags
@@ -8,6 +8,4 @@ W: changelog-file-general: improbable-bug-number-in-closes 12
W: changelog-file-general: latest-debian-changelog-entry-without-new-date
W: changelog-file-general: latest-debian-changelog-entry-without-new-version
W: changelog-file-general: misspelled-closes-bug #666666
-W: changelog-file-general: syntax-error-in-debian-changelog line 31 "badly formatted heading line"
-W: changelog-file-general: syntax-error-in-debian-changelog line 33 "found change data where expected next heading or eof"
X: changelog-file-general: bad-intended-distribution intended to experimental but uploaded to unstable
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: