r52266 - in /desktop/unstable/libsecret/debian: changelog patches/0004-tests-collection-add-setup-delay.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Mar 19 21:26:59 2017
New Revision: 52266

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52266
Log:
* Non-maintainer upload.
* debian/patches/0004-tests-collection-add-setup-delay.patch:
  + Fix failing test "collection/delete-sync" by correctly placing
    the delay. Closes: #855951.

Modified:
    desktop/unstable/libsecret/debian/changelog
    desktop/unstable/libsecret/debian/patches/0004-tests-collection-add-setup-delay.patch

Modified: desktop/unstable/libsecret/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/changelog?rev=52266&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/changelog	[utf-8] Sun Mar 19 21:26:59 2017
@@ -1,3 +1,12 @@
+libsecret (0.18.5-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/0004-tests-collection-add-setup-delay.patch:
+    + Fix failing test "collection/delete-sync" by correctly placing
+      the delay. Closes: #855951.
+
+ -- Carsten Leonhardt <leo at debian.org>  Sat, 18 Mar 2017 15:56:31 +0000
+
 libsecret (0.18.5-3) unstable; urgency=medium
 
   [ Jeremy Bicha ]

Modified: desktop/unstable/libsecret/debian/patches/0004-tests-collection-add-setup-delay.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/patches/0004-tests-collection-add-setup-delay.patch?rev=52266&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/patches/0004-tests-collection-add-setup-delay.patch	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/patches/0004-tests-collection-add-setup-delay.patch	[utf-8] Sun Mar 19 21:26:59 2017
@@ -2,9 +2,14 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=779041
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837067
 
---- a/libsecret/test-collection.c
-+++ b/libsecret/test-collection.c
-@@ -56,6 +56,8 @@
+Update by Carsten Leonhardt <leo at debian.org>: move sleep(1) to the
+beginning of teardown() to address bug #855951
+
+Index: libsecret-0.18.5/libsecret/test-collection.c
+===================================================================
+--- libsecret-0.18.5.orig/libsecret/test-collection.c
++++ libsecret-0.18.5/libsecret/test-collection.c
+@@ -56,12 +56,15 @@ setup (Test *test,
  	test->service = secret_service_get_sync (SECRET_SERVICE_NONE, NULL, &error);
  	g_assert_no_error (error);
  	g_object_add_weak_pointer (G_OBJECT (test->service), (gpointer *)&test->service);
@@ -13,11 +18,10 @@
  }
  
  static void
-@@ -67,6 +69,7 @@
+ teardown (Test *test,
+           gconstpointer unused)
+ {
++	sleep(1);
+ 	g_object_unref (test->service);
+ 	secret_service_disconnect ();
  	g_assert (test->service == NULL);
- 
- 	mock_service_stop ();
-+	sleep(1);
- }
- 
- static void