[libconfig-model-dpkg-perl] 04/10: Merge branch 'master' into check-unused-licenses-live

[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 4a16aad97edbcc8cca5c41a7bfa0bfb0d46eab6f
Merge: f59b9ed fd319b6
Author: Dominique Dumont <dod at debian.org>
Date:   Tue Sep 6 13:29:27 2016 +0200

    Merge branch 'master' into check-unused-licenses-live

 debian/changelog                               |  6 ++++
 lib/Config/Model/Dpkg/Dependency.pm            |  5 +++-
 lib/Config/Model/models/Dpkg/Control/Source.pl | 39 ++++++++++++--------------
 t/dpkg.t                                       | 29 +++++++++++++------
 t/model_tests.d/dpkg-control-test-conf.pl      |  1 +
 5 files changed, 49 insertions(+), 31 deletions(-)

diff --cc t/dpkg.t
index 6c7186a,0ee1b9f..44de4ff
--- a/t/dpkg.t
+++ b/t/dpkg.t
@@@ -111,22 -112,32 +112,32 @@@ warning_like 
      $root->load('control source Testsuite=autopkgtest-foobar');
  } qr/unknown value/i, "check that a warning is emitted for unknown Testsuite value";
  
- # delete wrong Testsuite value
- $root->load('control source Testsuite~') ;
+ my @teams = (
+     'Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>',
+     'Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>',
+ );
+ 
+ foreach my $team (@teams) {
+     # reset testsuite values, maintainer cannot be null, so use John Doe instead
+     # of a packaging team that triggers a special behavior
+     $root->load('control source Maintainer="John Doe <john at doe.com>" Testsuite~') ;
+     my ($str) = ($team =~ /pkg-(perl|ruby)/);
+     my $target =  "autopkgtest-pkg-$str";
  
- $root->load('control source Maintainer="Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>"');
- is($root->grab_value("control source Testsuite"), 'autopkgtest-pkg-perl','check Testsuite pkg-perl output');
+     $root->load(qq!control source Maintainer="$team"!);
+     is($root->grab_value("control source Testsuite"), undef,'check Testsuite default value');
+     $root->grab('control source Testsuite')->apply_fixes;
  
- $root->load('control source Maintainer="Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>"');
- is($root->grab_value("control source Testsuite"), 'autopkgtest-pkg-ruby','check Testsuite pkg-ruby output');
+     is($root->grab_value("control source Testsuite"), $target,"check Testsuite $str output");
+ }
  
+ # perl vs ruby, requires that loop above does not finish with perl team
  warning_like {
      $root->load('control source Testsuite=autopkgtest-pkg-perl');
- } qr/wrong team value/i, "check that a warning is emitted for Testsuite value mistmatch";
- 
+ } qr/maintainer team/i, "check that a warning is emitted for Testsuite value mistmatch";
  
  
 -my $lic_text = $root->grab("copyright License:FooBar text");
 +my $lic_text = $root->grab(steps => "copyright License:FooBar text", check => 'no');
  is($lic_text->fetch, undef, "test unknown lic text") ;
  
  say "store lic_text" if $trace ;

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