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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-29-g1e44b6a



The following commit has been merged in the master branch:
commit 1e44b6a6cf8c14993ea0e40dd9e32254af59c6a9
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Mar 26 11:48:40 2011 +0100

    Further improved menu-format test coverage

diff --git a/t/COVERAGE b/t/COVERAGE
index 2e610a6..2802e7a 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -117,7 +117,6 @@ menu-format menu-icon-too-big
 menu-format menu-item-contains-unknown-tag
 menu-format menu-item-needs-dwww
 menu-format old-format-menu-file
-menu-format pkg-not-in-package-test
 menu-format whitespace-after-continuation-character
 
 menus doc-base-abstract-field-is-template
@@ -278,8 +277,6 @@ menu-format desktop-contains-deprecated-header
 menu-format desktop-entry-missing-required-key
 menu-format menu-item-missing-required-tag
 menu-format menu-item-needs-tag-has-unknown-value
-menu-format menu-item-uses-windowmanagers-section
-menu-format non-wm-in-windowmanager-menu-section
 menu-format non-wm-module-in-wm-modules-menu-section
 menu-format su-to-root-with-usr-sbin
 menu-format su-wrapper-not-su-to-root
@@ -375,9 +372,7 @@ binary
   menu-file-in-usr-lib
   menu-item-missing-required-tag
   menu-item-needs-tag-has-unknown-value
-  menu-item-uses-windowmanagers-section
   menu-method-should-include-menu-h
-  non-wm-in-windowmanager-menu-section
   non-wm-module-in-wm-modules-menu-section
   old-fsf-address-in-copyright-file
   package-contains-hardlink
diff --git a/t/tests/menu-format-general/debian/debian/menu-broken.menu b/t/tests/menu-format-general/debian/debian/menu-broken.menu
index 6fcacee..8765274 100644
--- a/t/tests/menu-format-general/debian/debian/menu-broken.menu
+++ b/t/tests/menu-format-general/debian/debian/menu-broken.menu
@@ -1,9 +1,12 @@
 ?package(menu-broken):needs="X11" section="Applications/Programming"\
   title="pargs (missing slash)" command="/usr/bin/pargs"\
   longtitle="Argument printer (bad-test)"
-  icon="none" newtag="some value"
+  icon="none" newtag=unquoted-value
+?package(wrong-package):needs="X11" section="Applications/Programming"\
+  title="pargs (wrong pkg)" command="/usr/bin/pargs"\
+  longtitle="Argument printer"
 ?package(menu-broken):needs="X11" section="Applications/Programming"\
-  title="pargs (dup)" command="/usr/bin/pargs"\
+  title="pargs (dup+unparse)" command="/usr/bin/pargs"\
   longtitle="Argument printer"\
   longtitle="Argument printer"\
   unparseable-stuff
diff --git a/t/tests/menu-format-general/debian/debian/menu-section.menu b/t/tests/menu-format-general/debian/debian/menu-section.menu
index 45d8af8..8c56fde 100644
--- a/t/tests/menu-format-general/debian/debian/menu-section.menu
+++ b/t/tests/menu-format-general/debian/debian/menu-section.menu
@@ -7,3 +7,6 @@
 ?package(menu-section):needs="X11" section="Apps/Programming"\
   title="pargs (apps/prog)" command="/usr/bin/pargs"\
   longtitle="Argument printer"
+?package(menu-section):needs="X11" section="WindowManagers/Programming"\
+  title="pargs (vm)" command="/usr/bin/pargs"\
+  longtitle="Argument printer"
diff --git a/t/tests/menu-format-general/desc b/t/tests/menu-format-general/desc
index eee5e0e..a703c42 100644
--- a/t/tests/menu-format-general/desc
+++ b/t/tests/menu-format-general/desc
@@ -12,4 +12,7 @@ Test-For:
  menu-item-uses-apps-games-section
  menu-item-uses-apps-section
  menu-item-uses-icon-none
+ menu-item-uses-windowmanagers-section
+ non-wm-in-windowmanager-menu-section
+ pkg-not-in-package-test
  unparsable-menu-item
diff --git a/t/tests/menu-format-general/tags b/t/tests/menu-format-general/tags
index cae99e4..e52aac1 100644
--- a/t/tests/menu-format-general/tags
+++ b/t/tests/menu-format-general/tags
@@ -1,12 +1,16 @@
 E: menu-broken: bad-test-in-menu-item usr/share/menu/menu-broken:4
-E: menu-broken: unparsable-menu-item usr/share/menu/menu-broken:9
+E: menu-broken: unparsable-menu-item usr/share/menu/menu-broken:12
 E: menu-section: menu-item-creates-new-root-section Root usr/share/menu/menu-section:3
-W: menu-broken: duplicated-tag-in-menu-item usr/share/menu/menu-broken longtitle:9
+E: menu-section: non-wm-in-windowmanager-menu-section x11 usr/share/menu/menu-section:12
+W: menu-broken: duplicated-tag-in-menu-item usr/share/menu/menu-broken longtitle:12
+W: menu-broken: pkg-not-in-package-test wrong-package usr/share/menu/menu-broken
 W: menu-cmd: menu-command-not-in-package usr/share/menu/menu-cmd:3 usr/bin/not-here
 W: menu-none: menu-icon-missing non-existent.xpm
 W: menu-none: menu-icon-missing usr/share/menu-none/non-existent16.xpm
 W: menu-none: menu-icon-missing usr/share/menu-none/non-existent32.xpm
 W: menu-none: menu-item-uses-icon-none usr/share/menu/menu-none:4
 W: menu-section: menu-item-creates-new-section Apps/Games usr/share/menu/menu-section:6
+W: menu-section: menu-item-creates-new-section WindowManagers/Programming usr/share/menu/menu-section:12
 W: menu-section: menu-item-uses-apps-games-section usr/share/menu/menu-section:6
 W: menu-section: menu-item-uses-apps-section usr/share/menu/menu-section:9
+W: menu-section: menu-item-uses-windowmanagers-section usr/share/menu/menu-section:12

-- 
Debian package checker


Reply to: