r40982 - in /trunk/libconfig-model-openssh-perl: ChangeLog META.yml debian/changelog lib/Config/Model/OpenSsh.pm lib/Config/Model/models/Ssh/HostElement.pl t/ssh_config.t
ddumont-guest at users.alioth.debian.org
ddumont-guest at users.alioth.debian.org
Wed Jul 29 11:28:34 UTC 2009
Author: ddumont-guest
Date: Wed Jul 29 11:28:26 2009
New Revision: 40982
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40982
Log:
ready for review
Modified:
trunk/libconfig-model-openssh-perl/ChangeLog
trunk/libconfig-model-openssh-perl/META.yml
trunk/libconfig-model-openssh-perl/debian/changelog
trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm
trunk/libconfig-model-openssh-perl/lib/Config/Model/models/Ssh/HostElement.pl
trunk/libconfig-model-openssh-perl/t/ssh_config.t
Modified: trunk/libconfig-model-openssh-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/ChangeLog?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/ChangeLog (original)
+++ trunk/libconfig-model-openssh-perl/ChangeLog Wed Jul 29 11:28:26 2009
@@ -1,3 +1,11 @@
+2009-07-29 Dominique Dumont <dominique.dumont at hp.com> v1.207
+
+ * t/ssh_config.t: When run as root, skip the tests that must be
+ run as regular user. (Fix Debian FTBS #502033)
+
+ * lib/Config/Model/models/Ssh/HostElement.pl: Fix model error:
+ ServerAliveInterval is an integer, not a boolean
+
2009-06-24 Dominique Dumont <domi.dumont at free.fr> v1.206
* Build.PL: added forgotten dependency on
Modified: trunk/libconfig-model-openssh-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/META.yml?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/META.yml (original)
+++ trunk/libconfig-model-openssh-perl/META.yml Wed Jul 29 11:28:26 2009
@@ -1,6 +1,6 @@
---
name: Config-Model-OpenSsh
-version: 1.206
+version: 1.207
author:
- Dominique Dumont (ddumont at cpan dot org)
abstract: OpenSsh configuration files graphical editor
@@ -19,7 +19,7 @@
provides:
Config::Model::OpenSsh:
file: lib/Config/Model/OpenSsh.pm
- version: 1.206
+ version: 1.207
generated_by: Module::Build version 0.33
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
Modified: trunk/libconfig-model-openssh-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/debian/changelog?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/debian/changelog (original)
+++ trunk/libconfig-model-openssh-perl/debian/changelog Wed Jul 29 11:28:26 2009
@@ -1,3 +1,13 @@
+libconfig-model-openssh-perl (1.207-1) unstable; urgency=low
+
+ * New upstream release (fix model error)
+
+ * Fix "test suite fails on amd64" (upstream skips tests that cannot
+ work when run as root)
+ (Closes: #537395)
+
+ -- Dominique Dumont <dominique.dumont at hp.com> Wed, 29 Jul 2009 13:23:32 +0200
+
libconfig-model-openssh-perl (1.206-1) unstable; urgency=low
[ Nathan Handler ]
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/OpenSsh.pm Wed Jul 29 11:28:26 2009
@@ -18,7 +18,7 @@
use Parse::RecDescent ;
use vars qw($VERSION $grammar $parser) ;
-$VERSION = '1.206' ;
+$VERSION = '1.207' ;
my $logger = Log::Log4perl::get_logger(__PACKAGE__);
Modified: trunk/libconfig-model-openssh-perl/lib/Config/Model/models/Ssh/HostElement.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/lib/Config/Model/models/Ssh/HostElement.pl?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/lib/Config/Model/models/Ssh/HostElement.pl (original)
+++ trunk/libconfig-model-openssh-perl/lib/Config/Model/models/Ssh/HostElement.pl Wed Jul 29 11:28:26 2009
@@ -557,7 +557,7 @@
},
'ServerAliveInterval',
{
- 'value_type' => 'boolean',
+ 'value_type' => 'integer',
'warp' => {
'follow' => {
'batch_mode' => '?BatchMode'
Modified: trunk/libconfig-model-openssh-perl/t/ssh_config.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-openssh-perl/t/ssh_config.t?rev=40982&op=diff
==============================================================================
--- trunk/libconfig-model-openssh-perl/t/ssh_config.t (original)
+++ trunk/libconfig-model-openssh-perl/t/ssh_config.t Wed Jul 29 11:28:26 2009
@@ -9,6 +9,7 @@
use Config::Model::OpenSsh ; # required for tests
use Log::Log4perl qw(:easy) ;
use File::Path ;
+use English;
use warnings;
#no warnings qw(once);
@@ -110,44 +111,49 @@
is_deeply([split /\n/,$dump2],[split /\n/,$dump],
"check if both root_ssh dumps are identical") ;
-# now test reading user configuration file on top of root file
-&Config::Model::OpenSsh::_set_test_ssh_root_file(0);
+SKIP: {
+ skip "user tests when test is run as root", 8
+ unless $EUID > 0 ;
-my $user_inst = $model->instance (root_class_name => 'Ssh',
- instance_name => 'user_ssh_instance',
- root_dir => $wr_dir,
- );
-ok($user_inst,"Read user .ssh/config and created instance") ;
+ # now test reading user configuration file on top of root file
+ &Config::Model::OpenSsh::_set_test_ssh_root_file(0);
-my $user_cfg = $user_inst -> config_root ;
+ my $user_inst = $model->instance (root_class_name => 'Ssh',
+ instance_name => 'user_ssh_instance',
+ root_dir => $wr_dir,
+ );
-$dump = $user_cfg->dump_tree (mode => 'full' );
-print $dump if $trace ;
+ ok($user_inst,"Read user .ssh/config and created instance") ;
-like($dump,qr/Host:1/, "check Host section") ;
-like($dump,qr/patterns=foo\.\*,\*\.bar/,"check root Host pattern") ;
-like($dump,qr/patterns=mine.bar/,"check user Host pattern") ;
+ my $user_cfg = $user_inst -> config_root ;
-#require Tk::ObjScanner; Tk::ObjScanner::scan_object($user_cfg) ;
-$user_inst->write_back() ;
-my $joe_file = $wr_dir.$joe_home.'/.ssh/config' ;
-ok(1,"wrote user .ssh/config data in $joe_file") ;
+ $dump = $user_cfg->dump_tree (mode => 'full' );
+ print $dump if $trace ;
-ok(-e $joe_file,"Found $joe_file") ;
+ like($dump,qr/Host:1/, "check Host section") ;
+ like($dump,qr/patterns=foo\.\*,\*\.bar/,"check root Host pattern") ;
+ like($dump,qr/patterns=mine.bar/,"check user Host pattern") ;
-# compare original and written file
-my @joe_orig = read_user_ssh($wr_dir.$joe_home.'/.ssh/config') ;
-my @joe_written = read_user_ssh($joe_file) ;
-is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files") ;
+ #require Tk::ObjScanner; Tk::ObjScanner::scan_object($user_cfg) ;
+ $user_inst->write_back() ;
+ my $joe_file = $wr_dir.$joe_home.'/.ssh/config' ;
+ ok(1,"wrote user .ssh/config data in $joe_file") ;
-# write some data
-$user_cfg->load('EnableSSHKeysign=1') ;
-$user_inst->write_back() ;
-unshift @joe_orig,'EnableSSHKeysign yes';
- at joe_written = read_user_ssh($joe_file) ;
-is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files after modif") ;
+ ok(-e $joe_file,"Found $joe_file") ;
+ # compare original and written file
+ my @joe_orig = read_user_ssh($wr_dir.$joe_home.'/.ssh/config') ;
+ my @joe_written = read_user_ssh($joe_file) ;
+ is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files") ;
+
+ # write some data
+ $user_cfg->load('EnableSSHKeysign=1') ;
+ $user_inst->write_back() ;
+ unshift @joe_orig,'EnableSSHKeysign yes';
+ @joe_written = read_user_ssh($joe_file) ;
+ is_deeply(\@joe_written,\@joe_orig,"check user .ssh/config files after modif") ;
+}
__END__
More information about the Pkg-perl-cvs-commits
mailing list