r35455 - in /desktop/experimental/glib2.0/debian: changelog patches/07_socket_test_timespan_jitter.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Jun 26 14:10:23 2012
New Revision: 35455

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35455
Log:
Add 07_socket_test_timespan_jitter.patch:  On some buildds the poll
duration in the /socket/timed_wait test is slightly lower than the
requested 100000. Adjust test to not fail in these cases. Forwarded to
GNOME #678881.

Added:
    desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.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=35455&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Jun 26 14:10:23 2012
@@ -12,6 +12,10 @@
     avoid failure on the buildds where creating /home/buildd/.dbus-keyrings
     fails.
   * debian/rules: Fail the build on failed tests.
+  * Add 07_socket_test_timespan_jitter.patch:  On some buildds the poll
+    duration in the /socket/timed_wait test is slightly lower than the
+    requested 100000. Adjust test to not fail in these cases. Forwarded to
+    GNOME #678881.
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 26 Jun 2012 09:29:35 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch?rev=35455&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch [utf-8] Tue Jun 26 14:10:23 2012
@@ -1,0 +1,17 @@
+Description: On some buildds the poll duration in the /socket/timed_wait test is slightly lower than the requested 100000. Adjust test to not fail in these cases.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=678881
+
+Index: glib2.0-2.33.2/gio/tests/socket.c
+===================================================================
+--- glib2.0-2.33.2.orig/gio/tests/socket.c	2012-04-13 01:39:20.000000000 +0200
++++ glib2.0-2.33.2/gio/tests/socket.c	2012-06-26 16:00:58.185666813 +0200
+@@ -616,7 +616,7 @@
+   g_clear_error (&error);
+   poll_duration = g_get_monotonic_time () - start_time;
+ 
+-  g_assert_cmpint (poll_duration, >=, 100000);
++  g_assert_cmpint (poll_duration, >=, 98000);
+   g_assert_cmpint (poll_duration, <, 110000);
+ 
+   g_socket_close (client, &error);

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35455&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Jun 26 14:10:23 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_socket_test_timespan_jitter.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch