r28834 - in /desktop/unstable/pygobject/debian: changelog patches/00git_test_case_hang.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Jul 13 06:25:08 2011
New Revision: 28834

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28834
Log:
Add 00git_test_case_hang.patch: Fix hang in test suite when
TestGDBusClient.test_native_calls_async() test case fails. (Cherrypicked
from upstream pygobject-2-28 branch.)

Added:
    desktop/unstable/pygobject/debian/patches/00git_test_case_hang.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=28834&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Wed Jul 13 06:25:08 2011
@@ -1,3 +1,11 @@
+pygobject (2.28.6-3) UNRELEASED; urgency=low
+
+  * Add 00git_test_case_hang.patch: Fix hang in test suite when
+    TestGDBusClient.test_native_calls_async() test case fails. (Cherrypicked
+    from upstream pygobject-2-28 branch.)
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 13 Jul 2011 08:21:03 +0200
+
 pygobject (2.28.6-2) unstable; urgency=low
 
   * Cherrypick some fixes from pygobject-2-28 upstream branch:

Added: desktop/unstable/pygobject/debian/patches/00git_test_case_hang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/00git_test_case_hang.patch?rev=28834&op=file
==============================================================================
--- desktop/unstable/pygobject/debian/patches/00git_test_case_hang.patch (added)
+++ desktop/unstable/pygobject/debian/patches/00git_test_case_hang.patch [utf-8] Wed Jul 13 06:25:08 2011
@@ -1,0 +1,31 @@
+From 09d6cc2a6c857c7ef96432a279a853410718b150 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Fri, 8 Jul 2011 10:15:53 +0200
+Subject: [PATCH] gdbus tests: Fix hang if test case fails
+
+In the TestGDBusClient.test_native_calls_async() test case, the main loop was
+never quit when the call failed.
+---
+ tests/test_gdbus.py |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_gdbus.py b/tests/test_gdbus.py
+index a9442fe..ca4150a 100644
+--- a/tests/test_gdbus.py
++++ b/tests/test_gdbus.py
+@@ -67,8 +67,10 @@ class TestGDBusClient(unittest.TestCase):
+ 
+     def test_native_calls_async(self):
+         def call_done(obj, result, user_data):
+-            user_data['result'] = obj.call_finish(result)
+-            user_data['main_loop'].quit()
++            try:
++                user_data['result'] = obj.call_finish(result)
++            finally:
++                user_data['main_loop'].quit()
+ 
+         main_loop = gobject.MainLoop()
+         data = {'main_loop': main_loop}
+-- 
+1.7.5.4
+

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=28834&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Wed Jul 13 06:25:08 2011
@@ -1,4 +1,5 @@
 00git_enum_properties.patch
 00git_cairo_init.patch
 00git_textiter_crash.patch
+00git_test_case_hang.patch
 20_deprecated_spam.patch