Attachment 927138 Details for Bug 1118760 – include upstream test change in packaging

[patch] include upstream test change in packaging

0001-Improve-gkm-timer-test-reliability.patch (text/plain), 2.39 KB, created by David King on 2014-08-15 14:45:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-08-15 14:45:09 UTC

Size: 2.39 KB

patch

obsolete

>From 6ceb206ffca3d62b06112c4165587d855a732e76 Mon Sep 17 00:00:00 2001
>From: David King <dking@redhat.com>
>Date: Fri, 15 Aug 2014 15:12:42 +0100
>Subject: [PATCH] Improve gkm timer test reliability
>
>Resolves: #1118760
>---
> 0001-gkm-A-testing-reliability-fix.patch | 25 +++++++++++++++++++++++++
> gnome-keyring.spec                       |  4 +++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 0001-gkm-A-testing-reliability-fix.patch
>
>diff --git a/0001-gkm-A-testing-reliability-fix.patch b/0001-gkm-A-testing-reliability-fix.patch
>new file mode 100644
>index 0000000..b9b3437
>--- /dev/null
>+++ b/0001-gkm-A-testing-reliability-fix.patch
>@@ -0,0 +1,25 @@
>+From c15de770a49866a1c35b57994fa514dbefef141e Mon Sep 17 00:00:00 2001
>+From: Stef Walter <stefw@gnome.org>
>+Date: Wed, 19 Mar 2014 20:25:43 +0100
>+Subject: [PATCH] gkm: A testing reliability fix
>+
>+---
>+ pkcs11/gkm/tests/test-timer.c | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/pkcs11/gkm/tests/test-timer.c b/pkcs11/gkm/tests/test-timer.c
>+index 92f12da..1b1d825 100644
>+--- a/pkcs11/gkm/tests/test-timer.c
>++++ b/pkcs11/gkm/tests/test-timer.c
>+@@ -91,7 +91,7 @@ test_cancel (Test* test, gconstpointer unused)
>+ 	gkm_timer_cancel (timer);
>+ 
>+ 	mock_module_leave ();
>+-	egg_test_wait_until (2000);
>++	egg_test_wait_until (3000);
>+ 	mock_module_enter ();
>+ 
>+ 	/* The callback should not have been called */
>+-- 
>+1.8.3.1
>+
>diff --git a/gnome-keyring.spec b/gnome-keyring.spec
>index 7ff83c8..fdf4ba0 100644
>--- a/gnome-keyring.spec
>+++ b/gnome-keyring.spec
>@@ -21,6 +21,7 @@ Patch1: 0001-Some-man-page-updates-for-gnome-keyring-daemon.patch
> Patch2: 0002-Add-a-man-page-for-the-gnome-keyring-tool.patch
> Patch3: 0003-Add-an-alias-man-page-for-gnome-keyring-3.patch
> Patch4: 0001-pam-Fix-issue-with-changed-password-not-unlocking-ke.patch
>+Patch5: 0001-gkm-A-testing-reliability-fix.patch
> 
> BuildRequires: glib2-devel >= %{glib2_version}
> BuildRequires: gcr-devel >= %{gcr_version}
>@@ -131,8 +132,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
> 
> 
> %changelog
>-* Tue May 06 2014 David King <dking@redhat.com> - 3.8.2-9
>+* Fri Aug 15 2014 David King <dking@redhat.com> - 3.8.2-9
> - Enable hardening flags (#1092550)
>+- Improve reliability of gkm timer test (#1118760)
> 
> * Wed Apr 23 2014 Zeeshan Ali <zeenix@redhat.com> - 3.8.2-8
> - Remove patch 'daemon: Exit gnome-keyring-daemon when the DBus connection
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1118760: 927138