Permalink
Browse files

Only tests were changed to fix Debian FTBS

  • Loading branch information...
dod38fr committed May 24, 2012
1 parent d78ddb9 commit d754e1151554704c915f57875062261fdb44005f
Showing with 14 additions and 5 deletions.
  1. +1 −0 Build.PL
  2. +6 −0 ChangeLog
  3. +1 −1 lib/Config/Model/Backend/Augeas.pm
  4. +3 −2 t/augeas_backend.t
  5. +3 −2 t/augeas_from_scratch.t
View
@@ -45,6 +45,7 @@ my $build = Module::Build->new
'Test::More' => 0,
'Test::Exception' => 0,
'Test::Warn' => '0.11', # tests fail with 0.08
+ 'version' => '0.77'
},
# cleanup required by t/augeas_backend.t
View
@@ -1,3 +1,9 @@
+2012-05-24 Dominique Dumont <domi.dumont@free.fr> v0.111
+
+ * In t/*.t: Change the way Augeas version is tested to cope with 0.10.0
+ (Closes Debian #674390)
+ + build-depends on version 0.77
+
2011-09-21 Dominique Dumont <domi.dumont@free.fr> v0.110
* Moosified C::M::Backend::Augeas (fixes Debian #642156)
@@ -32,7 +32,7 @@ my $has_augeas = 1;
eval { require Config::Augeas ;} ;
$has_augeas = 0 if $@ ;
-our $VERSION = '0.110';
+our $VERSION = '0.111';
my $logger = get_logger('Backend::Augeas') ;
View
@@ -14,6 +14,7 @@ use Config::Model;
use File::Path;
use File::Copy ;
use Data::Dumper ;
+use version 0.77 ;
use warnings;
no warnings qw(once);
@@ -135,11 +136,11 @@ my $aug_version = $have_pkg_config ? `pkg-config --modversion augeas` : '' ;
chomp $aug_version ;
my $skip = (not $have_pkg_config) ? 'pkgconfig is not installed'
- : $aug_version le '0.3.1' ? 'Need Augeas library > 0.3.1'
+ : version->parse($aug_version) le version->parse('0.3.1') ? 'Need Augeas library > 0.3.1'
: '';
SKIP: {
- skip $skip , 5 if $skip ;
+ skip $skip , 8 if $skip ;
my $i_sshd = $model->instance(instance_name => 'sshd_inst',
root_class_name => 'Sshd',
View
@@ -8,6 +8,7 @@ use Config::Model;
use File::Path;
use File::Copy ;
use Data::Dumper ;
+use version 0.77 ;
use warnings;
no warnings qw(once);
@@ -61,11 +62,11 @@ my $aug_version = $have_pkg_config ? `pkg-config --modversion augeas` : '' ;
chomp $aug_version ;
my $skip = (not $have_pkg_config) ? 'pkgconfig is not installed'
- : $aug_version le '0.3.1' ? 'Need Augeas library > 0.3.1'
+ : version->parse($aug_version) le version->parse('0.3.1') ? 'Need Augeas library > 0.3.1'
: '';
SKIP: {
- skip $skip , 5 if $skip ;
+ skip $skip , 3 if $skip ;
my $i_sshd = $model->instance(instance_name => 'sshd_inst',
root_class_name => 'Sshd',

0 comments on commit d754e11

Please sign in to comment.