r32288 - in /trunk/libgtk2-perl/debian: changelog patches/try-to-fix-recent-chooser-tests

[ryan52-guest at users.alioth.debian.org]

Author: ryan52-guest
Date: Mon Mar 23 23:15:37 2009
New Revision: 32288

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32288
Log:
Try to fix the failing tests again

Modified:
    trunk/libgtk2-perl/debian/changelog
    trunk/libgtk2-perl/debian/patches/try-to-fix-recent-chooser-tests

Modified: trunk/libgtk2-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/changelog?rev=32288&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/changelog (original)
+++ trunk/libgtk2-perl/debian/changelog Mon Mar 23 23:15:37 2009
@@ -2,6 +2,7 @@
 
   * New upstream release
   * update dependencies for newer versions of Pango and Glib
+  * Try to fix the failing tests again
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 18 Mar 2009 22:44:02 -0700
 

Modified: trunk/libgtk2-perl/debian/patches/try-to-fix-recent-chooser-tests
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libgtk2-perl/debian/patches/try-to-fix-recent-chooser-tests?rev=32288&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/patches/try-to-fix-recent-chooser-tests (original)
+++ trunk/libgtk2-perl/debian/patches/try-to-fix-recent-chooser-tests Mon Mar 23 23:15:37 2009
@@ -3,15 +3,63 @@
 
 --- a/t/GtkRecentChooser.t
 +++ b/t/GtkRecentChooser.t
-@@ -50,7 +50,11 @@
- $manager -> add_item($uri_two);
+@@ -45,24 +45,28 @@
+ my $uri_one = "file://" . cwd() . "/" . $0;
+ my $uri_two = "file://" . $^X;
  
- # add_item() is asynchronous, so let the main loop spin for a while
-+print STDERR "\nwaiting for there to be items\n";
++# add_item() is asynchronous, so let the main loop spin for a while
+ $manager -> purge_items();
++Gtk2->main_iteration while $manager->get_items;
++Gtk2->main_iteration while Gtk2->events_pending;
+ $manager -> add_item($uri_one);
+-$manager -> add_item($uri_two);
+-
+-# add_item() is asynchronous, so let the main loop spin for a while
  Gtk2->main_iteration while !$manager->get_items;
-+print STDERR "waiting for pending events to finish\n";
 +Gtk2->main_iteration while Gtk2->events_pending;
-+print STDERR "done\n";
++$manager -> add_item($uri_two);
++Gtk2->main_iteration while Gtk2->events_pending;
  
  $chooser -> set_select_multiple(FALSE);
  
++Gtk2->main_iteration while Gtk2->events_pending;
+ run_main(sub {
+   $chooser -> set_current_uri($uri_one);
+ });
+-
++Gtk2->main_iteration while Gtk2->events_pending;
+ run_main(sub {
+   is($chooser -> get_current_uri(), $uri_one);
+   is($chooser -> get_current_item() -> get_uri(), $uri_one);
+ });
+-
++Gtk2->main_iteration while Gtk2->events_pending;
+ $chooser -> select_uri($uri_two);
+ $chooser -> unselect_uri($uri_two);
+ 
+@@ -70,20 +74,22 @@
+ 
+ $chooser -> select_all();
+ $chooser -> unselect_all();
+-
++Gtk2->main_iteration while Gtk2->events_pending;
+ is_deeply([$chooser -> get_uris()], [$uri_two, $uri_one]);
+ is_deeply([map { $_ -> get_uri() } $chooser -> get_items()], [$uri_two, $uri_one]);
+-
++Gtk2->main_iteration while Gtk2->events_pending;
+ my $filter_one = Gtk2::RecentFilter -> new();
+ my $filter_two = Gtk2::RecentFilter -> new();
+ 
+ $chooser -> add_filter($filter_one);
+ $chooser -> add_filter($filter_two);
++Gtk2->main_iteration while Gtk2->events_pending;
+ is_deeply([$chooser -> list_filters()], [$filter_one, $filter_two]);
+ $chooser -> remove_filter($filter_two);
+ $chooser -> remove_filter($filter_one);
+-
++Gtk2->main_iteration while Gtk2->events_pending;
+ $chooser -> set_filter($filter_one);
++Gtk2->main_iteration while Gtk2->events_pending;
+ is($chooser -> get_filter(), $filter_one);
+ 
+ unlink "./test.xbel";