r35733 - in /desktop/experimental/glib2.0/debian: changelog patches/07_socket_test_bump_max_time.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Sep 20 16:05:00 2012
New Revision: 35733

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35733
Log:
Add 07_socket_test_bump_max_time.patch: Increase /socket/timed_wait test
max time. On slow architectures like armel, this test often fails due to
"(poll_duration < 110000): (154022 < 110000)".

Added:
    desktop/experimental/glib2.0/debian/patches/07_socket_test_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=35733&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Sep 20 16:05:00 2012
@@ -2,6 +2,9 @@
 
   * debian/rules: Only run tests for the main flavour; it takes too
     long for all three and does not give us a lot of extra confidence.
+  * Add 07_socket_test_bump_max_time.patch: Increase /socket/timed_wait test
+    max time. On slow architectures like armel, this test often fails due to
+    "(poll_duration < 110000): (154022 < 110000)".
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 20 Sep 2012 17:57:19 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/07_socket_test_bump_max_time.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_socket_test_bump_max_time.patch?rev=35733&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_socket_test_bump_max_time.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_socket_test_bump_max_time.patch [utf-8] Thu Sep 20 16:05:00 2012
@@ -1,0 +1,33 @@
+From b45e7cf776e455dfc7d99684c7c3efc1783adb32 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Thu, 20 Sep 2012 18:01:18 +0200
+Subject: [PATCH] Increase /socket/timed_wait test max time
+
+On slow architectures like armel, this test often fails with something like
+
+  /socket/timed_wait:
+GLib-GIO:ERROR:./gio/tests/socket.c:620:test_timed_wait: assertion failed
+  (poll_duration < 110000): (154022 < 110000)
+FAIL
+
+Bump the maximum time.
+---
+ gio/tests/socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/tests/socket.c b/gio/tests/socket.c
+index 0a61c9f..cd92e91 100644
+--- a/gio/tests/socket.c
++++ b/gio/tests/socket.c
+@@ -617,7 +617,7 @@ test_timed_wait (void)
+   poll_duration = g_get_monotonic_time () - start_time;
+ 
+   g_assert_cmpint (poll_duration, >=, 98000);
+-  g_assert_cmpint (poll_duration, <, 110000);
++  g_assert_cmpint (poll_duration, <, 160000);
+ 
+   g_socket_close (client, &error);
+   g_assert_no_error (error);
+-- 
+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=35733&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Sep 20 16:05:00 2012
@@ -4,6 +4,7 @@
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
 06_thread_test_ignore_prctl_fail.patch
+07_socket_test_bump_max_time.patch
 08_disable_gapplication_basic_test.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch