[libconfig-model-dpkg-perl] 33/36: Suppres most spurious messages in tests...

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit a66e9ee0c54a06aa92d23580a320181a9f24a66e
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Oct 17 18:07:47 2015 +0200

    Suppres most spurious messages in tests...
    
    ... also this will show up only with CMD::Tester 2.052
---
 t/model_tests.d/dpkg-copyright-test-conf.pl | 10 +++++++---
 t/model_tests.d/dpkg-test-conf.pl           | 14 +++++++++-----
 t/scanner/scan-copyright.t                  |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/t/model_tests.d/dpkg-copyright-test-conf.pl b/t/model_tests.d/dpkg-copyright-test-conf.pl
index a062da2..a4dbc5b 100644
--- a/t/model_tests.d/dpkg-copyright-test-conf.pl
+++ b/t/model_tests.d/dpkg-copyright-test-conf.pl
@@ -51,7 +51,7 @@ $skip = ( $@ or not -r '/etc/debian_version') ? 1 : 0 ;
 
     # the empty license will default to 'other'
     { # t3
-        load_warnings => [ (qr/deprecated/) x 3 ],
+        load_warnings => [ (qr/deprecated/) x 3, qr/use Expat/ ],
 
         check => {
             'Comment' => "\nHeader comment 1/2\nHeader comment 2/2",
@@ -207,6 +207,8 @@ in ‘/usr/share/common-licenses/GPL-1’.",
     },
     {
         name => 'oar',
+        load_warnings => [ qr/use Expat/ ],
+        no_warnings => 1,
 
         check => {
             'Files:"sources/extra/orpheus/modules/lua-signal/lsignal.c" License short_name'
@@ -264,7 +266,8 @@ in ‘/usr/share/common-licenses/GPL-1’.",
 
     {
         name => 'update-from-scratch',
-        update => { in => path('t/scanner/examples/pan.in') },
+        update => { in => path('t/scanner/examples/pan.in') , quiet => 1 },
+        no_warnings => 1,
         check => {
             "License:GPL-2 text" => {value => undef, mode => 'custom'},
             "License:GPL-2 text" => qr/GNU/,
@@ -277,7 +280,8 @@ in ‘/usr/share/common-licenses/GPL-1’.",
 
     {
         name => 'moarvm-from-scratch',
-        update => { in => path('t/scanner/examples/moarvm.in') },
+        update => { in => path('t/scanner/examples/moarvm.in'), quiet => 1 },
+        no_warnings => 1,
         check => {
             'License:ISC text' => qr/Please fill/,
             'License:BSD-2-clause text' => qr/Please fill/,
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index 90c3eef..2666c50 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -53,7 +53,8 @@ my $del_home = sub {
     },
     {
         name => 'pan-copyright-from-scratch',
-        update => { in => path('t/scanner/examples/pan.in') },
+        update => { in => path('t/scanner/examples/pan.in'), quiet => 1, no_warnings => 0 },
+        no_warnings => 1,
         check => {
             "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},
             "copyright License:GPL-2 text" => qr/GNU/,
@@ -72,7 +73,9 @@ my $del_home = sub {
     {
         # should that be pan-copyright-upgrate ? :-p
         name => 'pan-copyright-upgrade-update',
-        update => { in => path('t/scanner/examples/pan.in') },
+        update => { in => path('t/scanner/examples/pan.in'), quiet => 1 },
+        no_warnings => 1,
+
         check => {
             "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},
             "copyright License:GPL-2 text" => qr/GNU/,
@@ -97,7 +100,8 @@ my $del_home = sub {
         # emulate removed and added file, updated copyright years
         # the difference with above test is in debian/copyright file to be updated
         name => 'pan-copyright-upgrade-update-more',
-        update => { in => path('t/scanner/examples/pan.in') },
+        update => { in => path('t/scanner/examples/pan.in'), quiet => 1 },
+        no_warnings => 1,
         check => {
             "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},
             "copyright License:GPL-2 text" => qr/GNU/,
@@ -126,7 +130,7 @@ my $del_home = sub {
     {
         # Debian bug #795195
         name => 'open-nebula-from-scratch',
-        update => { in => path('t/scanner/examples/open-nebula.in') },
+        update => { in => path('t/scanner/examples/open-nebula.in'), quiet => 1 },
         file_contents_like => {
             'debian/copyright' => [
                 qr!Files: src/im_mad/remotes/az.d/\*!
@@ -147,7 +151,7 @@ my $del_home = sub {
     {
         # Debian bug #795195
         name => 'open-nebula',
-        update => { in => path('t/scanner/examples/open-nebula.in') },
+        update => { in => path('t/scanner/examples/open-nebula.in'), quiet => 1 },
         file_contents_like => {
             'debian/copyright' => [
                 qr!Files: src/im_mad/remotes/az.d/\*!
diff --git a/t/scanner/scan-copyright.t b/t/scanner/scan-copyright.t
index 2367bd1..e3e73a5 100644
--- a/t/scanner/scan-copyright.t
+++ b/t/scanner/scan-copyright.t
@@ -22,7 +22,7 @@ foreach my $in ($dir->children(qr/\.in$/)) {
     next if @ARGV and not grep { $test_name =~ /$_/; } @ARGV;
     my $out_name =  $test_name. '.out';
     my $out = $dir->child($out_name);
-    print_copyright( in => $in, out => $temp );
+    print_copyright( in => $in, out => $temp , quiet => 1);
 
     files_eq_or_diff($out, $temp, "check $test_name copyright");
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git