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

[SCM] Debian package checker branch, master, updated. 2.5.10-91-g07b4cd5



The following commit has been merged in the master branch:
commit 07b4cd530fc364df4a79431518003a704122e07f
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jul 24 11:06:09 2012 +0200

    t: Extend debconf-templates-general
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/COVERAGE b/t/COVERAGE
index b3cd903..aed35cf 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-07-23
-Coverage (Tags): 855/962 (88.88%), w. legacy tests: 943/962 (98.02%)
+Last generated 2012-07-24
+Coverage (Tags): 863/962 (89.71%), w. legacy tests: 943/962 (98.02%)
 Coverage (Checks): 32/41 (78.05%), w. legacy tests: 35/41 (85.37%)
 
 The following tags are not tested by the test suite:
@@ -40,10 +40,6 @@ binaries unstripped-binary-or-object
 debconf config-does-not-load-confmodule
 debconf debconf-config-not-executable
 debconf loads-obsolete-confmodule
-debconf making-assumptions-about-interfaces-in-templates
-debconf malformed-prompt-in-templates
-debconf malformed-question-in-templates
-debconf malformed-title-in-templates
 debconf missing-debconf-dependency
 debconf missing-debconf-dependency-for-preinst
 debconf no-debconf-templates
@@ -53,11 +49,7 @@ debconf postinst-uses-db-input
 debconf postrm-does-not-purge-debconf
 debconf template-uses-unsplit-choices
 debconf too-long-extended-description-in-templates
-debconf too-long-short-description-in-templates
 debconf unknown-debconf-priority
-debconf using-first-person-in-templates
-debconf using-imperative-form-in-templates
-debconf using-question-in-extended-description-in-templates
 
 files desktop-file-in-wrong-dir
 files package-contains-devhelp-file-without-symlink
@@ -166,10 +158,6 @@ binary
 
 debconf
   loads-obsolete-confmodule
-  making-assumptions-about-interfaces-in-templates
-  malformed-prompt-in-templates
-  malformed-question-in-templates
-  malformed-title-in-templates
   missing-debconf-dependency
   missing-debconf-dependency-for-preinst
   newer-debconf-templates
@@ -178,13 +166,9 @@ debconf
   postrm-does-not-purge-debconf
   template-uses-unsplit-choices
   too-long-extended-description-in-templates
-  too-long-short-description-in-templates
   udeb-postinst-must-not-call-ldconfig
   unknown-debconf-priority
   unknown-encoding-in-po-file
-  using-first-person-in-templates
-  using-imperative-form-in-templates
-  using-question-in-extended-description-in-templates
 
 debug
   binary-with-bad-dynamic-table
diff --git a/t/tests/debconf-templates-general/debian/config-gen.pl b/t/tests/debconf-templates-general/debian/config-gen.pl
index c93484f..0734c30 100644
--- a/t/tests/debconf-templates-general/debian/config-gen.pl
+++ b/t/tests/debconf-templates-general/debian/config-gen.pl
@@ -27,6 +27,6 @@ sub pg {
     my $template = $paragraph->{'template'};
     # Some of them will not have a name, so skip those.
     return unless $template;
-    print "db_input medium $template || true\n";
+    print "db_input high $template || true\n";
     print "db_go\n\n";
 }
diff --git a/t/tests/debconf-templates-general/debian/debian/templates b/t/tests/debconf-templates-general/debian/debian/templates
index 87563ed..95b6a2c 100644
--- a/t/tests/debconf-templates-general/debian/debian/templates
+++ b/t/tests/debconf-templates-general/debian/debian/templates
@@ -50,3 +50,61 @@ Type: boolean
 Description: Is the field below unknown?
 Unknown-field: yes, it is.
 
+Template: debconf/malformed-prompt
+Type: string
+Description: What is the name of this package checker:
+
+Template: debconf/imperative-select
+Type: select
+Choices: x,y
+Description: Select either x or y
+
+Template: debconf/malformed-question
+Type: boolean
+Description: Lintian is the best!
+
+Template: debconf/question-in-extended
+Type: boolean
+Description: Do you like sakana?
+ Or do you prefer sake?
+
+Template: debconf/malformed-note-title
+Type: note
+Description: Aren't you tired of all these debconf prompts?
+
+Template: debconf/too-long-short-desc
+Type: boolean
+Description: This template has a very long short description, is that what you call an oxymoron?
+
+Template: debconf/first-person
+Type: select
+Choices: lintian, no-lintian
+Description: I think Lintian is the best
+
+Template: debconf/assumption
+Type: boolean
+Description: Do you like Lintian?
+ Pick "yes" if you do.
+
+Template: debconf/4-green-bottles-on-the-wall
+Type: string
+Description: Name the title of this song:
+ Four green bottles sitting on the wall,
+ Four green bottles sitting on the wall,
+ And if one green bottle should accidentally fall,
+ There'll be three green bottles sitting on the wall.
+ .
+ Three green bottles sitting on the wall,
+ Three green bottles sitting on the wall,
+ And if one green bottle should accidentally fall,
+ There'll be two green bottles sitting on the wall.
+ .
+ Two green bottles sitting on the wall,
+ Two green bottles sitting on the wall,
+ And if one green bottle should accidentally fall,
+ There'll be one green bottle sitting on the wall.
+ .
+ One green bottle sitting on the wall,
+ One green bottle sitting on the wall,
+ And if one green bottle should accidentally fall,
+ There'll be no green bottles sitting on the wall.
diff --git a/t/tests/debconf-templates-general/desc b/t/tests/debconf-templates-general/desc
index ed5eb7d..408bd76 100644
--- a/t/tests/debconf-templates-general/desc
+++ b/t/tests/debconf-templates-general/desc
@@ -6,12 +6,20 @@ Test-For:
  boolean-template-has-bogus-default
  duplicate-long-description-in-template
  empty-translated-choices
+ making-assumptions-about-interfaces-in-templates
+ malformed-prompt-in-templates
+ malformed-question-in-templates
  malformed-template-name
+ malformed-title-in-templates
  mismatch-translated-choices
  no-template-description
  no-template-name
  no-template-type
  select-with-boolean-choices
  select-without-choices
+ too-long-short-description-in-templates
  unknown-field-in-templates
  unknown-template-type
+ using-first-person-in-templates
+ using-imperative-form-in-templates
+ using-question-in-extended-description-in-templates
diff --git a/t/tests/debconf-templates-general/tags b/t/tests/debconf-templates-general/tags
index 5d286b0..05dd49b 100644
--- a/t/tests/debconf-templates-general/tags
+++ b/t/tests/debconf-templates-general/tags
@@ -9,4 +9,12 @@ E: debconf-templates-general: select-without-choices debconf/select-without-choi
 E: debconf-templates-general: unknown-field-in-templates debconf/unknown-field unknown-field
 E: debconf-templates-general: unknown-template-type lintian
 W: debconf-templates-general: duplicate-long-description-in-template debconf/duplicate-long-desc
+W: debconf-templates-general: making-assumptions-about-interfaces-in-templates debconf/assumption
+W: debconf-templates-general: malformed-prompt-in-templates debconf/malformed-prompt
+W: debconf-templates-general: malformed-question-in-templates debconf/malformed-question
+W: debconf-templates-general: malformed-title-in-templates debconf/malformed-note-title
 W: debconf-templates-general: select-with-boolean-choices debconf/select-boolean-choice
+W: debconf-templates-general: too-long-short-description-in-templates debconf/too-long-short-desc
+W: debconf-templates-general: using-first-person-in-templates debconf/first-person
+W: debconf-templates-general: using-imperative-form-in-templates debconf/imperative-select
+W: debconf-templates-general: using-question-in-extended-description-in-templates debconf/question-in-extended

-- 
Debian package checker


Reply to: