r35621 - in /desktop/experimental/glib2.0/debian: changelog patches/07_test_method_calls_on_proxy_bump_max_time.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Aug 20 04:11:37 2012
New Revision: 35621

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35621
Log:
Add 07_test_method_calls_on_proxy_bump_max_time.patch: On slower
platforms, the overhead of the 240 D-BUS Sleep calls is larger than
the current maximum of 6 seconds. Bump maximum time to 8 seconds to be
more resilient to this.

Added:
    desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.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=35621&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Aug 20 04:11:37 2012
@@ -1,9 +1,16 @@
 glib2.0 (2.33.8-2) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * Add revert_g_file_make_directory_with_parents_error_propagation.patch:
     This reverts upstream commit b0bce4ad41937dabf7e5c94dcce3caf4e88f3f97
     which caused applications to segfault. The proper fix will be in the next
     glib release, so this patch should be dropped then. (LP: #1035688)
+
+  [ Martin Pitt ]
+  * Add 07_test_method_calls_on_proxy_bump_max_time.patch: On slower
+    platforms, the overhead of the 240 D-BUS Sleep calls is larger than
+    the current maximum of 6 seconds. Bump maximum time to 8 seconds to be
+    more resilient to this.
 
  -- Iain Lane <laney at debian.org>  Thu, 16 Aug 2012 11:48:21 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.patch?rev=35621&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.patch [utf-8] Mon Aug 20 04:11:37 2012
@@ -1,0 +1,34 @@
+From 268d948744fa4d287737f109cd48c5c640e41d40 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Mon, 20 Aug 2012 06:02:31 +0200
+Subject: [PATCH] Bump max time in test_method_calls_on_proxy() test
+
+On slower platforms, the overhead of the 240 D-BUS Sleep calls is larger than
+the current maximum of 6 seconds. A run on a Panda board sometimes fails with
+
+  ERROR:/build/buildd/glib2.0-2.33.8/./gio/tests/gdbus-threading.c:409:test_method_calls_on_proxy:
+  assertion failed (elapsed_msec < 6000): (7365 < 6000)
+
+Bump maximum time to 8 seconds to be more resilient to this.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=682222
+---
+ gio/tests/gdbus-threading.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
+index c1fc97e..728b70e 100644
+--- a/gio/tests/gdbus-threading.c
++++ b/gio/tests/gdbus-threading.c
+@@ -406,7 +406,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
+ 
+       /* elapsed_msec should be 4000 msec +/- change for overhead/inaccuracy */
+       g_assert_cmpint (elapsed_msec, >=, 3950);
+-      g_assert_cmpint (elapsed_msec,  <, 6000);
++      g_assert_cmpint (elapsed_msec,  <, 8000);
+ 
+       g_print (" ");
+     }
+-- 
+1.7.10.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35621&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Aug 20 04:11:37 2012
@@ -3,6 +3,7 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
+07_test_method_calls_on_proxy_bump_max_time.patch
 10_increase_gapplication_test_delay.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch