Control: tags -1 patch pending Dear maintainer,
I've prepared an NMU for libsecret (versioned as 0.18.5-3.1) and am about to upload it to DELAYED/5. Please feel free to tell me if I should delay it longer. After the package enters unstable, I'll open another bug for the release team to unblock it. - Carsten
diff -Nru libsecret-0.18.5/debian/changelog libsecret-0.18.5/debian/changelog --- libsecret-0.18.5/debian/changelog 2017-02-21 22:57:01.000000000 +0100 +++ libsecret-0.18.5/debian/changelog 2017-03-18 16:56:31.000000000 +0100 @@ -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 <l...@debian.org> Sat, 18 Mar 2017 15:56:31 +0000 + libsecret (0.18.5-3) unstable; urgency=medium [ Jeremy Bicha ] diff -Nru libsecret-0.18.5/debian/patches/0004-tests-collection-add-setup-delay.patch libsecret-0.18.5/debian/patches/0004-tests-collection-add-setup-delay.patch --- libsecret-0.18.5/debian/patches/0004-tests-collection-add-setup-delay.patch 2017-02-21 22:56:07.000000000 +0100 +++ libsecret-0.18.5/debian/patches/0004-tests-collection-add-setup-delay.patch 2017-03-18 16:55:44.000000000 +0100 @@ -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 <l...@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 @@ - g_assert (test->service == NULL); - - mock_service_stop (); + teardown (Test *test, + gconstpointer unused) + { + sleep(1); - } - - static void + g_object_unref (test->service); + secret_service_disconnect (); + g_assert (test->service == NULL);
