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

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jun 27 08:38:01 2012
New Revision: 35467

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35467
Log:
Rename 07_socket_test_timespan_jitter.patch to 00git_* and update
changelog with what got committed upstream.

Added:
    desktop/experimental/glib2.0/debian/patches/00git_socket_test_timespan_jitter.patch
      - copied, changed from r35466, desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch
Removed:
    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=35467&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Jun 27 08:38:01 2012
@@ -1,3 +1,10 @@
+glib2.0 (2.33.3-2) UNRELEASED; urgency=low
+
+  * Rename 07_socket_test_timespan_jitter.patch to 00git_* and update
+    changelog with what got committed upstream.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 27 Jun 2012 10:37:07 +0200
+
 glib2.0 (2.33.3-1) experimental; urgency=low
 
   * New upstream release.

Copied: desktop/experimental/glib2.0/debian/patches/00git_socket_test_timespan_jitter.patch (from r35466, 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/00git_socket_test_timespan_jitter.patch?rev=35467&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_socket_test_timespan_jitter.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/00git_socket_test_timespan_jitter.patch [utf-8] Wed Jun 27 08:38:01 2012
@@ -1,12 +1,29 @@
-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>
+From 72af44cb1249f02cbe56376a751e3ae6d3b39ea8 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Tue, 26 Jun 2012 18:32:29 +0200
+Subject: [PATCH] Allow slightly too small poll duration in /socket/timed_wait
+ test
+
+Sometimes the poll duration in the /socket/timed_wait test is slightly lower
+than the requested 100000, causing failures like
+
+ERROR:/build/buildd/glib2.0-2.33.2/./gio/tests/socket.c:619:test_timed_wait:
+  assertion failed (poll_duration > = 100000): (99240 >= 100000)
+FAIL
+
+Adjust the test to also allow some jitter in the "too small" direction, similar
+to the already existing span for "slightly too large".
+
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=678881
+---
+ gio/tests/socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-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 @@
+diff --git a/gio/tests/socket.c b/gio/tests/socket.c
+index 7404bba..0a61c9f 100644
+--- a/gio/tests/socket.c
++++ b/gio/tests/socket.c
+@@ -616,7 +616,7 @@ test_timed_wait (void)
    g_clear_error (&error);
    poll_duration = g_get_monotonic_time () - start_time;
  
@@ -15,3 +32,6 @@
    g_assert_cmpint (poll_duration, <, 110000);
  
    g_socket_close (client, &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=35467&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Jun 27 08:38:01 2012
@@ -1,9 +1,9 @@
+00git_socket_test_timespan_jitter.patch
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
 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