Attachment 66348 Details for Bug 42088 – Make the gnome-keyring test work again, with modern gnome-keyring

[patch] Make the gnome-keyring test work again, with modern gnome-keyring

0001-Make-the-gnome-keyring-test-work-again-with-modern-g.patch (text/plain), 2.01 KB, created by Simon McVittie on 2012-08-30 16:23:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-08-30 16:23:30 UTC

Size: 2.01 KB

patch

obsolete

>From b0a7842d289d61dcb7f72ad5b918c093f993b092 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 30 Aug 2012 16:53:36 +0100
>Subject: [PATCH] Make the gnome-keyring test work again, with modern
> gnome-keyring
>
>---
> tests/twisted/account-storage/default-keyring-storage.py |   11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/tests/twisted/account-storage/default-keyring-storage.py b/tests/twisted/account-storage/default-keyring-storage.py
>index 284fb77..7242f58 100644
>--- a/tests/twisted/account-storage/default-keyring-storage.py
>+++ b/tests/twisted/account-storage/default-keyring-storage.py
>@@ -32,6 +32,9 @@ from mctest import (
>     )
> import constants as cs
> 
>+# FIXME: this test relies on tools in the builddir. It won't work when
>+# the tests are installed and run without a builddir.
>+
> use_keyring = False
> if ('MC_TEST_GNOME_KEYRING' in os.environ and
>     os.environ['MC_TEST_GNOME_KEYRING'] == '1'):
>@@ -79,7 +82,9 @@ def start_gnome_keyring_daemon(ctl_dir):
>         return
> 
>     os.chmod(ctl_dir, 0700)
>-    env = os.popen('gnome-keyring-daemon -d --control-directory=' + ctl_dir).read()
>+    # Ugh. We have to put XDG_DATA_DIRS back the way we found them because
>+    # otherwise it won't find its schemas and everything goes horribly wrong.
>+    env = os.popen('/usr/bin/env XDG_DATA_DIRS=/usr/local/share:/usr/share gnome-keyring-daemon -d --control-directory=' + ctl_dir).read()
>     env_file = open(ctl_dir + '/gnome-keyring-env', 'w')
> 
>     for line in env.split('\n'):
>@@ -89,6 +94,10 @@ def start_gnome_keyring_daemon(ctl_dir):
>             os.environ[k] = v
>             env_file.write('%s=%s\n' % (k, v))
> 
>+    # Wait for gnome-keyring to start. We shouldn't have to do this, but,
>+    # whatever. Happily, we have a tool which can do this for us.
>+    os.system('../../util/mc-wait-for-name org.freedesktop.secrets')
>+
>     keyring_name = create_keyring()
>     assert keyring_name
>     print "Created new keyring name, putting to env", keyring_name
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 42088: 66348 | 66359 | 66360 | 66361 | 66362 | 66363 | 66364 | 66365 | 67272

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.