From bc7c58ee3c035eef673dd33d0d964303622a0c4e Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Wed, 6 Mar 2013 15:29:27 +1030
Subject: [PATCH] Improve keyring test case

---
 tests/keyring | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/keyring b/tests/keyring
index 0b3aeb91..f57742a0 100755
--- a/tests/keyring
+++ b/tests/keyring
@@ -105,7 +105,7 @@ test_KeyringPinIdentityPinless() {
 
 doc_KeyringAutoCreate="Starting a server with no keyring creates a valid identity"
 test_KeyringAutoCreate() {
-    servald_start
+    start_servald_server
     executeOk_servald keyring list
     assert_keyring_list 1
 }
@@ -113,6 +113,8 @@ finally_KeyringAutoCreate() {
     stop_servald_server
 }
 teardown_KeyringAutoCreate() {
+   kill_all_servald_processes
+   assert_no_servald_processes
    report_servald_server
 }