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

[SCM] Debian package checker branch, master, updated. 2.5.10-92-g6bdb7a6



The following commit has been merged in the master branch:
commit 6bdb7a62e501fef06da0a708684db3384eab1981
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jul 24 11:13:28 2012 +0200

    t: Extend template description in debconf-templates-general
    
    While 4 green bottles does not, 5 green bottles do trigger the
    "too-long-extended-description-in-templates".
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/COVERAGE b/t/COVERAGE
index aed35cf..ba72f60 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-07-24
-Coverage (Tags): 863/962 (89.71%), w. legacy tests: 943/962 (98.02%)
+Coverage (Tags): 864/962 (89.81%), 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:
@@ -48,7 +48,6 @@ debconf postinst-does-not-load-confmodule
 debconf postinst-uses-db-input
 debconf postrm-does-not-purge-debconf
 debconf template-uses-unsplit-choices
-debconf too-long-extended-description-in-templates
 debconf unknown-debconf-priority
 
 files desktop-file-in-wrong-dir
@@ -165,7 +164,6 @@ debconf
   postinst-uses-db-input
   postrm-does-not-purge-debconf
   template-uses-unsplit-choices
-  too-long-extended-description-in-templates
   udeb-postinst-must-not-call-ldconfig
   unknown-debconf-priority
   unknown-encoding-in-po-file
diff --git a/t/tests/debconf-templates-general/debian/debian/templates b/t/tests/debconf-templates-general/debian/debian/templates
index 95b6a2c..94fba1d 100644
--- a/t/tests/debconf-templates-general/debian/debian/templates
+++ b/t/tests/debconf-templates-general/debian/debian/templates
@@ -86,9 +86,14 @@ Type: boolean
 Description: Do you like Lintian?
  Pick "yes" if you do.
 
-Template: debconf/4-green-bottles-on-the-wall
+Template: debconf/5-green-bottles-on-the-wall
 Type: string
 Description: Name the title of this song:
+ Five green bottles sitting on the wall,
+ Five green bottles sitting on the wall,
+ And if one green bottle should accidentally fall,
+ There'll be four green bottles sitting on the wall.
+ .
  Four green bottles sitting on the wall,
  Four green bottles sitting on the wall,
  And if one green bottle should accidentally fall,
diff --git a/t/tests/debconf-templates-general/desc b/t/tests/debconf-templates-general/desc
index 408bd76..b6efd5e 100644
--- a/t/tests/debconf-templates-general/desc
+++ b/t/tests/debconf-templates-general/desc
@@ -17,6 +17,7 @@ Test-For:
  no-template-type
  select-with-boolean-choices
  select-without-choices
+ too-long-extended-description-in-templates
  too-long-short-description-in-templates
  unknown-field-in-templates
  unknown-template-type
diff --git a/t/tests/debconf-templates-general/tags b/t/tests/debconf-templates-general/tags
index 05dd49b..a1e6cfd 100644
--- a/t/tests/debconf-templates-general/tags
+++ b/t/tests/debconf-templates-general/tags
@@ -14,6 +14,7 @@ W: debconf-templates-general: malformed-prompt-in-templates debconf/malformed-pr
 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-extended-description-in-templates debconf/5-green-bottles-on-the-wall
 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

-- 
Debian package checker


Reply to: