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

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

Author: ra28145-guest
Date: Wed Jul 28 13:53:20 2010
New Revision: 60735

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60735
Log:
Refreshed debian/patches/try-to-fix-recent-chooser-tests

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=60735&op=diff
==============================================================================
--- trunk/libgtk2-perl/debian/changelog (original)
+++ trunk/libgtk2-perl/debian/changelog Wed Jul 28 13:53:20 2010
@@ -4,6 +4,7 @@
     Closes: #590453 (libgtk2-perl: Gtk2::Dialog and descendents signal produces
                                                   different response to ->run())
   * Add myself to Uploaders and Copyright
+  * Refreshed all patches
 
  -- Jeffrey Ratcliffe <jeffrey.ratcliffe at gmail.com>  Wed, 28 Jul 2010 15:40:40 +0200
 

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=60735&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 Wed Jul 28 13:53:20 2010
@@ -3,8 +3,10 @@
 Bug-Debian: http://bugs.debian.org/519864
 Author: Ryan Niebur <ryan at debian.org>
 
---- a/t/GtkRecentChooser.t
-+++ b/t/GtkRecentChooser.t
+Index: libgtk2-perl/t/GtkRecentChooser.t
+===================================================================
+--- libgtk2-perl.orig/t/GtkRecentChooser.t	2010-07-28 15:38:00.000000000 +0200
++++ libgtk2-perl/t/GtkRecentChooser.t	2010-07-28 15:50:45.000000000 +0200
 @@ -2,7 +2,8 @@
  use strict;
  use Gtk2::TestHelper
@@ -16,8 +18,8 @@
  # $Id$
  
 @@ -45,24 +46,28 @@
- my $uri_one = "file://" . cwd() . "/" . $0;
- my $uri_two = "file://" . $^X;
+ my $uri_one = Glib::filename_to_uri(cwd() . "/" . $0, undef);
+ my $uri_two = Glib::filename_to_uri($^X, undef);
  
 +# add_item() is asynchronous, so let the main loop spin for a while
  $manager -> purge_items();
@@ -49,15 +51,14 @@
  $chooser -> select_uri($uri_two);
  $chooser -> unselect_uri($uri_two);
  
-@@ -70,20 +75,22 @@
+@@ -72,19 +77,23 @@
+ $chooser -> unselect_all();
  
- $chooser -> select_all();
- $chooser -> unselect_all();
--
+ my @expected_uris = sort ($uri_two, $uri_one);
 +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]);
--
+ is_deeply([sort $chooser -> get_uris()], \@expected_uris);
+ is_deeply([sort map { $_ -> get_uri() } $chooser -> get_items()], \@expected_uris);
+ 
 +Gtk2->main_iteration while Gtk2->events_pending;
  my $filter_one = Gtk2::RecentFilter -> new();
  my $filter_two = Gtk2::RecentFilter -> new();
@@ -69,9 +70,9 @@
  $chooser -> remove_filter($filter_two);
  $chooser -> remove_filter($filter_one);
 -
-+Gtk2->main_iteration while Gtk2->events_pending;
+++Gtk2->main_iteration while Gtk2->events_pending;
  $chooser -> set_filter($filter_one);
-+Gtk2->main_iteration while Gtk2->events_pending;
+++Gtk2->main_iteration while Gtk2->events_pending;
  is($chooser -> get_filter(), $filter_one);
  
  unlink "./test.xbel";