r35473 - in /desktop/experimental/glib2.0/debian: changelog patches/11_timeout_test_reduce_race.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jun 27 09:50:19 2012
New Revision: 35473

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35473
Log:
Add 11_timeout_test_reduce_race.patch: Due to load, particular traits of
the architecture, or other circumstances, the /mainloop/timeouts sometimes
manages to call the "every 100 ms" timer loop only 9 times in 1050 ms.
This is an inherent race-condition in the test; allow it some slack and
accept 9 times as well. Forwarded to GNOME #678959.

Added:
    desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.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=35473&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Jun 27 09:50:19 2012
@@ -14,6 +14,11 @@
     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
+  * Add 11_timeout_test_reduce_race.patch: Due to load, particular traits of
+    the architecture, or other circumstances, the /mainloop/timeouts sometimes
+    manages to call the "every 100 ms" timer loop only 9 times in 1050 ms.
+    This is an inherent race-condition in the test; allow it some slack and
+    accept 9 times as well. Forwarded to GNOME #678959.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 27 Jun 2012 10:37:07 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.patch?rev=35473&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.patch [utf-8] Wed Jun 27 09:50:19 2012
@@ -1,0 +1,34 @@
+From 01f67e438b4c73a45f5582f1f097a6f91ab360ca Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt at gnome.org>
+Date: Wed, 27 Jun 2012 11:46:28 +0200
+Subject: [PATCH 2/2] /mainloop/timeouts test: Reduce race condition
+
+Due to load, particular traits of the architecture, or other circumstances, the
+/mainloop/timeouts sometimes manages to call the "every
+100 ms" timer loop only 9 times in 1050 ms.
+
+This is an inherent race-condition in the test; allow it some slack and accept
+9 times as well.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=678959
+---
+ glib/tests/mainloop.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
+index 3f0bcee..3cef639 100644
+--- a/glib/tests/mainloop.c
++++ b/glib/tests/mainloop.c
+@@ -179,7 +179,8 @@ test_timeouts (void)
+ 
+   g_main_loop_run (loop);
+ 
+-  g_assert_cmpint (a, ==, 10);
++  g_assert_cmpint (a, >=, 9);
++  g_assert_cmpint (a, <=, 10);
+   g_assert_cmpint (b, ==, 4);
+   g_assert_cmpint (c, ==, 3);
+ 
+-- 
+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=35473&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:50:19 2012
@@ -8,6 +8,7 @@
 08_contenttype_known_test_failure.patch
 09_valuetransform_ulong_bool.patch
 10_increase_gapplication_test_delay.patch
+11_timeout_test_reduce_race.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch