r35472 - in /desktop/experimental/glib2.0/debian: changelog patches/10_increase_gapplication_test_delay.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jun 27 09:35:23 2012
New Revision: 35472

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35472
Log:
Add 10_increase_gapplication_test_delay.patch: /gapplication/basic
sometimes fails due to a different order of expected and actual actions;
increase delay between them to reduce the race condition. Workaround for
https://bugzilla.gnome.org/show_bug.cgi?id=664627

Added:
    desktop/experimental/glib2.0/debian/patches/10_increase_gapplication_test_delay.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35472&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Jun 27 09:35:23 2012
@@ -10,6 +10,10 @@
     https://bugzilla.gnome.org/show_bug.cgi?id=678941
   * Add 09_valuetransform_ulong_bool.patch: valuetransform: Fix definition of
     ulong_bool. Thanks Philipp Kern! (Closes: #662057)
+  * Add 10_increase_gapplication_test_delay.patch: /gapplication/basic
+    sometimes fails due to a different order of expected and actual actions;
+    increase delay between them to reduce the race condition. Workaround for
+    https://bugzilla.gnome.org/show_bug.cgi?id=664627
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 27 Jun 2012 10:37:07 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/10_increase_gapplication_test_delay.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_increase_gapplication_test_delay.patch?rev=35472&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_increase_gapplication_test_delay.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/10_increase_gapplication_test_delay.patch [utf-8] Wed Jun 27 09:35:23 2012
@@ -1,0 +1,25 @@
+Description: /gapplication/basic sometimes fails due to a different order of expected and actual actions; increase delay between them to reduce the race condition.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=664627
+
+diff --git a/gio/tests/gapplication.c b/gio/tests/gapplication.c
+index 2e0ea9d..5a3e789 100644
+--- a/gio/tests/gapplication.c
++++ b/gio/tests/gapplication.c
+@@ -103,14 +103,14 @@ basic (void)
+          "./app", NULL);
+ 
+   /* make sure it becomes the master */
+-  g_usleep (100000);
++  g_usleep (1000000);
+ 
+   /* send it some files */
+   spawn ("exit status: 0\n",
+          "./app", "/a", "/b", NULL);
+ 
+   /* make sure the commandline arrives after the files */
+-  g_usleep (100000);
++  g_usleep (1000000);
+ 
+   spawn ("40 + 2 = 42\n"
+          "exit status: 42\n",

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35472&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Jun 27 09:35:23 2012
@@ -7,6 +7,7 @@
 07_contenttype_test_fix_overflow.patch
 08_contenttype_known_test_failure.patch
 09_valuetransform_ulong_bool.patch
+10_increase_gapplication_test_delay.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch