[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.10-98-g4ef414c



The following commit has been merged in the master branch:
commit 4ef414c909a8f581f5245ad53be3206113fdf95a
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 25 12:04:38 2012 +0200

    t: Add tests for the remaining debconf tags
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/COVERAGE b/t/COVERAGE
index f57a8e1..ad3a420 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,14 +1,12 @@
 Last generated 2012-07-25
-Coverage (Tags): 875/962 (90.96%), w. legacy tests: 944/962 (98.13%)
-Coverage (Checks): 32/41 (78.05%), w. legacy tests: 35/41 (85.37%)
+Coverage (Tags): 878/962 (91.27%), w. legacy tests: 945/962 (98.23%)
+Coverage (Checks): 33/41 (80.49%), w. legacy tests: 36/41 (87.80%)
 
 The following tags are not tested by the test suite:
 
 binaries binary-file-compressed-with-upx
 binaries ocaml-custom-executable
 
-debconf debconf-is-not-a-registry
-
 files debug-package-should-be-named-dbg
 files udeb-contains-documentation-file
 
@@ -36,9 +34,6 @@ binaries debug-file-should-use-detached-symbols
 binaries statically-linked-binary
 binaries unstripped-binary-or-object
 
-debconf missing-debconf-dependency
-debconf no-debconf-templates
-
 files desktop-file-in-wrong-dir
 files package-contains-devhelp-file-without-symlink
 files package-contains-upstream-install-documentation
@@ -145,7 +140,6 @@ binary
   unstripped-binary-or-object
 
 debconf
-  missing-debconf-dependency
   newer-debconf-templates
   udeb-postinst-must-not-call-ldconfig
   unknown-encoding-in-po-file
@@ -181,7 +175,6 @@ maintainer-scripts
   init.d-script-not-marked-as-conffile
   maintainer-script-ignores-errors
   maintainer-script-removes-device-files
-  no-debconf-templates
   output-of-updaterc.d-not-redirected-to-dev-null
   postrm-contains-additional-updaterc.d-calls
   postrm-does-not-call-updaterc.d-for-init.d-script
diff --git a/t/tests/debconf-templates-general/debian/config-gen.pl b/t/tests/debconf-is-not-registry/debian/config-gen.pl
similarity index 100%
copy from t/tests/debconf-templates-general/debian/config-gen.pl
copy to t/tests/debconf-is-not-registry/debian/config-gen.pl
diff --git a/t/tests/debconf-is-not-registry/debian/debian/install b/t/tests/debconf-is-not-registry/debian/debian/install
new file mode 100644
index 0000000..28c8417
--- /dev/null
+++ b/t/tests/debconf-is-not-registry/debian/debian/install
@@ -0,0 +1 @@
+script usr/share/lintian
diff --git a/t/tests/debconf-config-general/debian/debian/po/POTFILES.in b/t/tests/debconf-is-not-registry/debian/debian/po/POTFILES.in
similarity index 100%
copy from t/tests/debconf-config-general/debian/debian/po/POTFILES.in
copy to t/tests/debconf-is-not-registry/debian/debian/po/POTFILES.in
diff --git a/t/tests/debconf-maintscripts-deps/debian/debian/po/da.po b/t/tests/debconf-is-not-registry/debian/debian/po/da.po
similarity index 87%
copy from t/tests/debconf-maintscripts-deps/debian/debian/po/da.po
copy to t/tests/debconf-is-not-registry/debian/debian/po/da.po
index e7cceb3..343c3e8 100644
--- a/t/tests/debconf-maintscripts-deps/debian/debian/po/da.po
+++ b/t/tests/debconf-is-not-registry/debian/debian/po/da.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
 "PO-Revision-Date: 2012-07-23 23:08+0200\n"
 "Last-Translator: Niels Thykier <niels@thykier.net>\n"
 "Language-Team: Danish\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -22,3 +22,4 @@ msgstr ""
 #: ../templates:1001
 msgid "Useless note"
 msgstr "Ubrugelig note"
+
diff --git a/t/tests/debconf-config-general/debian/debian/po/templates.pot b/t/tests/debconf-is-not-registry/debian/debian/po/templates.pot
similarity index 93%
copy from t/tests/debconf-config-general/debian/debian/po/templates.pot
copy to t/tests/debconf-is-not-registry/debian/debian/po/templates.pot
index 3edd4a9..fd4f94f 100644
--- a/t/tests/debconf-config-general/debian/debian/po/templates.pot
+++ b/t/tests/debconf-is-not-registry/debian/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,3 +22,4 @@ msgstr ""
 #: ../templates:1001
 msgid "Useless note"
 msgstr ""
+
diff --git a/t/tests/debconf-config-general/debian/debian/postinst b/t/tests/debconf-is-not-registry/debian/debian/postinst
similarity index 100%
copy from t/tests/debconf-config-general/debian/debian/postinst
copy to t/tests/debconf-is-not-registry/debian/debian/postinst
diff --git a/t/tests/debconf-maintscripts-deps/debian/debian/templates b/t/tests/debconf-is-not-registry/debian/debian/templates
similarity index 100%
copy from t/tests/debconf-maintscripts-deps/debian/debian/templates
copy to t/tests/debconf-is-not-registry/debian/debian/templates
diff --git a/t/tests/debconf-templates-general/debian/gen-source.mk b/t/tests/debconf-is-not-registry/debian/gen-source.mk
similarity index 100%
copy from t/tests/debconf-templates-general/debian/gen-source.mk
copy to t/tests/debconf-is-not-registry/debian/gen-source.mk
diff --git a/t/tests/debconf-maintscripts-deps/debian/debian/config b/t/tests/debconf-is-not-registry/debian/script
old mode 100644
new mode 100755
similarity index 89%
copy from t/tests/debconf-maintscripts-deps/debian/debian/config
copy to t/tests/debconf-is-not-registry/debian/script
index 9659eb3..3a05d3a
--- a/t/tests/debconf-maintscripts-deps/debian/debian/config
+++ b/t/tests/debconf-is-not-registry/debian/script
@@ -1,9 +1,6 @@
 #!/bin/sh
 
-set -e
-
 . /usr/share/debconf/confmodule
 
 db_get debconf/translated
 db_go
-
diff --git a/t/tests/debconf-is-not-registry/desc b/t/tests/debconf-is-not-registry/desc
new file mode 100644
index 0000000..d7d5f8c
--- /dev/null
+++ b/t/tests/debconf-is-not-registry/desc
@@ -0,0 +1,5 @@
+Testname: debconf-is-not-registry
+Sequence: 6000
+Version: 1.0
+Description: Test for using debconf as a registry
+Test-For: debconf-is-not-a-registry
diff --git a/t/tests/debconf-templates-general/pre_build b/t/tests/debconf-is-not-registry/pre_build
similarity index 100%
copy from t/tests/debconf-templates-general/pre_build
copy to t/tests/debconf-is-not-registry/pre_build
diff --git a/t/tests/debconf-is-not-registry/tags b/t/tests/debconf-is-not-registry/tags
new file mode 100644
index 0000000..1e40272
--- /dev/null
+++ b/t/tests/debconf-is-not-registry/tags
@@ -0,0 +1 @@
+W: debconf-is-not-registry: debconf-is-not-a-registry usr/share/lintian/script
diff --git a/t/tests/debconf-templates-general/debian/config-gen.pl b/t/tests/debconf-missing-dep/debian/config-gen.pl
similarity index 100%
copy from t/tests/debconf-templates-general/debian/config-gen.pl
copy to t/tests/debconf-missing-dep/debian/config-gen.pl
diff --git a/t/tests/debconf-config-general/debian/debian/po/POTFILES.in b/t/tests/debconf-missing-dep/debian/debian/po/POTFILES.in
similarity index 100%
copy from t/tests/debconf-config-general/debian/debian/po/POTFILES.in
copy to t/tests/debconf-missing-dep/debian/debian/po/POTFILES.in
diff --git a/t/tests/debconf-maintscripts-deps/debian/debian/po/da.po b/t/tests/debconf-missing-dep/debian/debian/po/da.po
similarity index 87%
copy from t/tests/debconf-maintscripts-deps/debian/debian/po/da.po
copy to t/tests/debconf-missing-dep/debian/debian/po/da.po
index e7cceb3..343c3e8 100644
--- a/t/tests/debconf-maintscripts-deps/debian/debian/po/da.po
+++ b/t/tests/debconf-missing-dep/debian/debian/po/da.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
 "PO-Revision-Date: 2012-07-23 23:08+0200\n"
 "Last-Translator: Niels Thykier <niels@thykier.net>\n"
 "Language-Team: Danish\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -22,3 +22,4 @@ msgstr ""
 #: ../templates:1001
 msgid "Useless note"
 msgstr "Ubrugelig note"
+
diff --git a/t/tests/debconf-config-general/debian/debian/po/templates.pot b/t/tests/debconf-missing-dep/debian/debian/po/templates.pot
similarity index 93%
copy from t/tests/debconf-config-general/debian/debian/po/templates.pot
copy to t/tests/debconf-missing-dep/debian/debian/po/templates.pot
index 3edd4a9..fd4f94f 100644
--- a/t/tests/debconf-config-general/debian/debian/po/templates.pot
+++ b/t/tests/debconf-missing-dep/debian/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,3 +22,4 @@ msgstr ""
 #: ../templates:1001
 msgid "Useless note"
 msgstr ""
+
diff --git a/t/tests/debconf-config-general/debian/debian/postinst b/t/tests/debconf-missing-dep/debian/debian/postinst
similarity index 100%
copy from t/tests/debconf-config-general/debian/debian/postinst
copy to t/tests/debconf-missing-dep/debian/debian/postinst
diff --git a/t/tests/debconf-missing-dep/debian/debian/rules b/t/tests/debconf-missing-dep/debian/debian/rules
new file mode 100644
index 0000000..f8e47a0
--- /dev/null
+++ b/t/tests/debconf-missing-dep/debian/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_gencontrol:
+	sed -i '/^misc:Depends=/ d' debian/*substvars
+	dh_gencontrol
diff --git a/t/tests/debconf-maintscripts-deps/debian/debian/templates b/t/tests/debconf-missing-dep/debian/debian/templates
similarity index 100%
copy from t/tests/debconf-maintscripts-deps/debian/debian/templates
copy to t/tests/debconf-missing-dep/debian/debian/templates
diff --git a/t/tests/debconf-templates-general/debian/gen-source.mk b/t/tests/debconf-missing-dep/debian/gen-source.mk
similarity index 100%
copy from t/tests/debconf-templates-general/debian/gen-source.mk
copy to t/tests/debconf-missing-dep/debian/gen-source.mk
diff --git a/t/tests/debconf-missing-dep/desc b/t/tests/debconf-missing-dep/desc
new file mode 100644
index 0000000..e9d52b2
--- /dev/null
+++ b/t/tests/debconf-missing-dep/desc
@@ -0,0 +1,5 @@
+Testname: debconf-missing-dep
+Sequence: 6000
+Version: 1.0
+Description: Test for missing debconf dependency
+Test-For: missing-debconf-dependency
diff --git a/t/tests/debconf-templates-general/pre_build b/t/tests/debconf-missing-dep/pre_build
similarity index 100%
copy from t/tests/debconf-templates-general/pre_build
copy to t/tests/debconf-missing-dep/pre_build
diff --git a/t/tests/debconf-missing-dep/tags b/t/tests/debconf-missing-dep/tags
new file mode 100644
index 0000000..a540625
--- /dev/null
+++ b/t/tests/debconf-missing-dep/tags
@@ -0,0 +1 @@
+W: debconf-missing-dep: missing-debconf-dependency
diff --git a/t/tests/debconf-syntax-error/debian/debian/config b/t/tests/debconf-no-templates/debian/debian/config
similarity index 100%
copy from t/tests/debconf-syntax-error/debian/debian/config
copy to t/tests/debconf-no-templates/debian/debian/config
diff --git a/t/tests/po-debconf-missing/debian/debian/postinst b/t/tests/debconf-no-templates/debian/debian/postinst
similarity index 100%
copy from t/tests/po-debconf-missing/debian/debian/postinst
copy to t/tests/debconf-no-templates/debian/debian/postinst
diff --git a/t/tests/debconf-no-templates/desc b/t/tests/debconf-no-templates/desc
new file mode 100644
index 0000000..27bb416
--- /dev/null
+++ b/t/tests/debconf-no-templates/desc
@@ -0,0 +1,6 @@
+Testname: debconf-no-templates
+Sequence: 6000
+Version: 1.0
+Description: Test for missing debconf templates
+Test-For: no-debconf-templates
+
diff --git a/t/tests/debconf-no-templates/tags b/t/tests/debconf-no-templates/tags
new file mode 100644
index 0000000..7fc8eb5
--- /dev/null
+++ b/t/tests/debconf-no-templates/tags
@@ -0,0 +1 @@
+W: debconf-no-templates: no-debconf-templates

-- 
Debian package checker


Reply to: