r49337 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-Fix-gio-tests-socket-listener.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Jul 20 20:20:52 2016
New Revision: 49337

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49337
Log:
* debian/patches/0001-Fix-gio-tests-socket-listener.patch:
  + Fix a test hang.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-Fix-gio-tests-socket-listener.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=49337&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Jul 20 20:20:52 2016
@@ -7,6 +7,8 @@
   * debian/patches/add-missing-gio-xml.patch:
     + Add gio.xml file, which is missing from the tarball. Needed for the
       documentation build.
+  * debian/patches/0001-Fix-gio-tests-socket-listener.patch:
+    + Fix a test hang.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 13 Jul 2016 17:42:46 +0200
 

Added: desktop/experimental/glib2.0/debian/patches/0001-Fix-gio-tests-socket-listener.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-Fix-gio-tests-socket-listener.patch?rev=49337&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-Fix-gio-tests-socket-listener.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-Fix-gio-tests-socket-listener.patch	[utf-8] Wed Jul 20 20:20:52 2016
@@ -0,0 +1,38 @@
+From 6de5595570a68e21ba83c60fbb889c07951200ab Mon Sep 17 00:00:00 2001
+From: Dan Winship <danw at gnome.org>
+Date: Tue, 19 Jul 2016 17:22:07 -0400
+Subject: [PATCH] Fix gio/tests/socket-listener
+
+g_socket_listener_add_address() is synchronous; all of the events will
+have been emitted before it returns and it doesn't queue any sources.
+The test was unintentionally depending on the fact that
+g_main_context_iterate(NULL, TRUE) would return anyway (at least the
+first time it was called), but that's no longer true after e4ee307.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=768968
+---
+ gio/tests/socket-listener.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/gio/tests/socket-listener.c b/gio/tests/socket-listener.c
+index 519d9a9..dcbbfdb 100644
+--- a/gio/tests/socket-listener.c
++++ b/gio/tests/socket-listener.c
+@@ -74,12 +74,9 @@ test_event_signal (void)
+                                  NULL,
+                                  &error);
+   g_assert_no_error (error);
+-  g_object_unref (saddr);
+-
+-  do
+-    g_main_context_iteration (NULL, TRUE);
+-  while (!success);
++  g_assert_true (success);
+ 
++  g_object_unref (saddr);
+   g_object_unref (listener);
+ }
+ 
+-- 
+2.8.1
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=49337&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Wed Jul 20 20:20:52 2016
@@ -13,3 +13,4 @@
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
 add-missing-gio-xml.patch
+0001-Fix-gio-tests-socket-listener.patch