[SCM] Support for components branch, master, updated. c926568effc8a2c787936810f165e90697b4be81

Nicholas Bamber nicholas at periapt.co.uk
Sat Nov 5 17:14:11 UTC 2011


The following commit has been merged in the master branch:
commit c926568effc8a2c787936810f165e90697b4be81
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Sat Nov 5 17:20:20 2011 +0000

    * Made t/01.basic.t not so dependent on order (partially closes: #647278)
    * Fixed build dependencies (Closes: #647278)
    * Added Suggests clause for devscripts as uscan-components depends on uscan

diff --git a/debian/changelog b/debian/changelog
index a0bf917..8ca4ca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-pkg-components (0.4) UNRELEASED; urgency=low
+pkg-components (0.4) UNRELEASED; urgency=medium
 
-  TODO:
-  - Need to make t/01.basic.t not so dependent on order
-  - Can we get rid of libperl6-slurp-perl now?
-
-  * Fixing build dependencies (will close: #647278)
+  * Made t/01.basic.t not so dependent on order (partially closes: #647278)
+  * Fixed build dependencies (Closes: #647278)
   * Moving package into Debian Perl Group
   * Updating repository fields
+  * Added Suggests clause for devscripts as uscan-components depends on uscan
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Fri, 04 Nov 2011 23:05:46 +0000
 
diff --git a/debian/control b/debian/control
index 130b238..f73972b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, make, libreadonly-xs-perl,
  libreadonly-perl, dpkg-dev (>= 1.14.27), libdebian-copyright-perl,
  dh-make-perl, libperl6-slurp-perl
+Suggests: devscripts
 Description: debhelper tool to help maintain bundles
  Support for additional components in debian/rules
  To be activated one would need to run 'dh --with components $@' and
diff --git a/t/01.basic.t b/t/01.basic.t
index 1d1f8f0..0345000 100644
--- a/t/01.basic.t
+++ b/t/01.basic.t
@@ -1,4 +1,4 @@
-use Test::More tests => 27;
+use Test::More tests => 37;
 use Debian::Debhelper::Dh_components;
 use Readonly;
 use Perl6::Slurp;
@@ -45,12 +45,19 @@ foreach my $bs ($components->build_stages) {
 $components->build_copyright($COPYRIGHT_OUT);
 my $expected = slurp 't/data/copyright/expected1';
 my $out = slurp $COPYRIGHT_OUT;
-is_string($out, $expected, "file contents");
+
+# We cannot entirely assume the order in which the components
+# will be assembled. See #647278.
+is(length $out, length $expected, "file contents length");
+my @expected = split /\n\n/, $expected;
+foreach my $stanza (@expected) {
+    contains_string($out, $stanza, "file contents stanza");
+}
 
 my $substvars = $components->substvars();
 my @substvars = $components->substvars();
-cmp_deeply($substvars, \@substvars, 'wantarray');
-cmp_deeply($substvars,
+cmp_bag($substvars, \@substvars, 'wantarray');
+cmp_bag($substvars,
     [
         {deppackage=>'dep3',component=>'comp2',substvar=>'Depends',rel=>undef,ver=>undef},
         {deppackage=>'dep4',component=>'comp2',substvar=>'Depends',rel=>'>=',ver=>'1.67'},

-- 
Support for components



More information about the Pkg-perl-cvs-commits mailing list