r70349 - in /trunk/libconfig-model-tkui-perl: ./ debian/ lib/Config/Model/ lib/Config/Model/Tk/ t/

ddumont-guest at users.alioth.debian.org ddumont-guest at users.alioth.debian.org
Fri Mar 4 12:21:50 UTC 2011


Author: ddumont-guest
Date: Fri Mar  4 12:21:33 2011
New Revision: 70349

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=70349
Log:
new upstream release to avoid FTBS. Ready for review

Modified:
    trunk/libconfig-model-tkui-perl/ChangeLog
    trunk/libconfig-model-tkui-perl/META.yml
    trunk/libconfig-model-tkui-perl/debian/changelog
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm
    trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm
    trunk/libconfig-model-tkui-perl/t/config-model-ui.t

Modified: trunk/libconfig-model-tkui-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/ChangeLog?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/ChangeLog (original)
+++ trunk/libconfig-model-tkui-perl/ChangeLog Fri Mar  4 12:21:33 2011
@@ -1,3 +1,8 @@
+2011-03-04  Dominique Dumont  <domi.dumont at free.fr> 1.322
+
+        * Changed nb of skipped tests (fix test plan issues
+         when Tk cannot be run)
+
 2011-03-01  Dominique Dumont  <domi.dumont at free.fr> 1.321
 
         * TkUi.pm: renamed 'check' menu to 'check for errors'. Added 'check for warnings'

Modified: trunk/libconfig-model-tkui-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/META.yml?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/META.yml (original)
+++ trunk/libconfig-model-tkui-perl/META.yml Fri Mar  4 12:21:33 2011
@@ -26,4 +26,4 @@
   Tk: 0
   Tk::DirSelect: 0
   Tk::Tree: 0
-version: 1.321
+version: 1.322

Modified: trunk/libconfig-model-tkui-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/debian/changelog?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/debian/changelog (original)
+++ trunk/libconfig-model-tkui-perl/debian/changelog Fri Mar  4 12:21:33 2011
@@ -1,26 +1,13 @@
-libconfig-model-tkui-perl (1.321-1) UNRELEASED; urgency=low
+libconfig-model-tkui-perl (1.322-1) unstable; urgency=low
 
-  TODO:
-  - ftbfs. fix:
-    --- t/config-model-ui.t (revision 70313)
-    +++ t/config-model-ui.t (working copy)
-    @@ -3,7 +3,7 @@
-     use warnings FATAL => qw(all);
-     
-     use ExtUtils::testlib;
-    -use Test::More tests => 52 ;
-    +use Test::More tests => 53 ;
-     use Test::Warn ;
-     use Tk;
-     use Config::Model::TkUI;
-  
   * New upstream release (improved usability)
-  * control: changed my e-mail address. Added libconfig-model-perl 
+    - Fix nb of skipped tests to avoid FTBS where Tk cannot run
+  * control: changed my e-mail address. Added libconfig-model-perl
    to Enhance field. Bumped *Depends version of libconfig-model-perl
    to 1.235
   * copyright: updated field names to latest DEP5
 
- -- Dominique Dumont <domi.dumont at free.fr>  Thu, 03 Mar 2011 14:09:02 +0100
+ -- Dominique Dumont <domi.dumont at free.fr>  Fri, 04 Mar 2011 13:20:06 +0100
 
 libconfig-model-tkui-perl (1.320-1) unstable; urgency=low
 

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/AnyViewer.pm Fri Mar  4 12:21:33 2011
@@ -27,7 +27,7 @@
 
 package Config::Model::Tk::AnyViewer ;
 BEGIN {
-  $Config::Model::Tk::AnyViewer::VERSION = '1.321';
+  $Config::Model::Tk::AnyViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::CheckListEditor ;
 BEGIN {
-  $Config::Model::Tk::CheckListEditor::VERSION = '1.321';
+  $Config::Model::Tk::CheckListEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/CheckListViewer.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::CheckListViewer ;
 BEGIN {
-  $Config::Model::Tk::CheckListViewer::VERSION = '1.321';
+  $Config::Model::Tk::CheckListViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::HashEditor ;
 BEGIN {
-  $Config::Model::Tk::HashEditor::VERSION = '1.321';
+  $Config::Model::Tk::HashEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/HashViewer.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::HashViewer ;
 BEGIN {
-  $Config::Model::Tk::HashViewer::VERSION = '1.321';
+  $Config::Model::Tk::HashViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::LeafEditor ;
 BEGIN {
-  $Config::Model::Tk::LeafEditor::VERSION = '1.321';
+  $Config::Model::Tk::LeafEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/LeafViewer.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::LeafViewer ;
 BEGIN {
-  $Config::Model::Tk::LeafViewer::VERSION = '1.321';
+  $Config::Model::Tk::LeafViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::ListEditor ;
 BEGIN {
-  $Config::Model::Tk::ListEditor::VERSION = '1.321';
+  $Config::Model::Tk::ListEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/ListViewer.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::ListViewer ;
 BEGIN {
-  $Config::Model::Tk::ListViewer::VERSION = '1.321';
+  $Config::Model::Tk::ListViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NodeEditor ;
 BEGIN {
-  $Config::Model::Tk::NodeEditor::VERSION = '1.321';
+  $Config::Model::Tk::NodeEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NodeViewer.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NodeViewer ;
 BEGIN {
-  $Config::Model::Tk::NodeViewer::VERSION = '1.321';
+  $Config::Model::Tk::NodeViewer::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/NoteEditor.pm Fri Mar  4 12:21:33 2011
@@ -9,7 +9,7 @@
 #
 package Config::Model::Tk::NoteEditor ;
 BEGIN {
-  $Config::Model::Tk::NoteEditor::VERSION = '1.321';
+  $Config::Model::Tk::NoteEditor::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/Tk/Wizard.pm Fri Mar  4 12:21:33 2011
@@ -10,7 +10,7 @@
 
 package Config::Model::Tk::Wizard ;
 BEGIN {
-  $Config::Model::Tk::Wizard::VERSION = '1.321';
+  $Config::Model::Tk::Wizard::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm (original)
+++ trunk/libconfig-model-tkui-perl/lib/Config/Model/TkUI.pm Fri Mar  4 12:21:33 2011
@@ -11,7 +11,7 @@
 
 package Config::Model::TkUI ;
 BEGIN {
-  $Config::Model::TkUI::VERSION = '1.321';
+  $Config::Model::TkUI::VERSION = '1.322';
 }
 
 use strict;

Modified: trunk/libconfig-model-tkui-perl/t/config-model-ui.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-model-tkui-perl/t/config-model-ui.t?rev=70349&op=diff
==============================================================================
--- trunk/libconfig-model-tkui-perl/t/config-model-ui.t (original)
+++ trunk/libconfig-model-tkui-perl/t/config-model-ui.t Fri Mar  4 12:21:33 2011
@@ -12,6 +12,13 @@
 
 
 use strict;
+
+sub test_all {
+    my ($mw, $delay,$test_ref) = @_ ;
+    my $test = shift @$test_ref ;
+    $test->() ;
+    $mw->after($delay, sub { test_all($mw, $delay,$test_ref) } ) if @$test_ref;
+}
 
 my $arg = shift || '';
 
@@ -100,29 +107,25 @@
     my $mw = eval {MainWindow-> new ; };
 
     # cannot create Tk window
-    skip "Cannot create Tk window",48 unless $mw;
+    skip "Cannot create Tk window",47 unless $mw;
 
     $mw->withdraw ;
 
-    my $cmu = $mw->ConfigModelUI (-root => $root, 
-			     ) ;
+    my $cmu = $mw->ConfigModelUI (-root => $root, ) ;
 
     my $delay = 200 ;
     
-    sub inc_d { $delay += 500 } ;
-
     my $tktree= $cmu->Subwidget('tree') ;
     my $mgr   = $cmu->Subwidget('multi_mgr') ;
     my $widget ; # ugly global variable. Use with care
     my $idx = 1 ;
 
-    my @force_test 
+    my @test 
       = (
 	 sub { $cmu->reload ; ok(1,"forced test: reload") } ,
 	) ;
 
-    my @test 
-      = (
+    push @test,  
 	 sub { $cmu->create_element_widget('edit','test1'); ok(1,"test ".$idx++)},
 	 sub { $cmu->force_element_display($root->grab('std_id:dd DX')) ; ok(1,"test ".$idx++)},
 	 sub { $cmu->edit_copy('test1.std_id'); ok(1,"test ".$idx++)},
@@ -186,20 +189,11 @@
 	     },
 	 sub { $root->load('warn_unless=foo2') ; $cmu->reload ;; ok(1,"test fix warn_unless ".$idx++)},
 
-	 sub { $mw->destroy; }
-	);
-
-    foreach my $t (@force_test) {
-	$mw->after($delay, $t);
-	inc_d ;
-    }
-
-    unless ($show) {
-	foreach my $t (@test) {
-	    $mw->after($delay, $t);
-	    inc_d ;
-	}
-    }
+	 sub { $mw->destroy; },
+        unless $show;
+
+
+    test_all($mw , $delay, \@test) ; 
 
     ok(1,"window launched") ;
 




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