Fix Clientlist.list_clients to list only client names.

2 files changed, 4 insertions, 1 deletions

diff --git a/obnamlib/clientlist.py b/obnamlib/clientlist.py
index 577889dc..99b6cfe6 100644
--- a/obnamlib/clientlist.py
+++ b/obnamlib/clientlist.py
@@ -72,7 +72,9 @@ class ClientList(obnamlib.RepositoryTree):
     def list_clients(self):
         if self.init_forest() and self.forest.trees:
             t = self.forest.trees[-1]
-            return [v for k, v in t.lookup_range(self.minkey, self.maxkey)]
+            return [v 
+                     for k, v in t.lookup_range(self.minkey, self.maxkey)
+                     if self.unkey(k)[2] == self.CLIENT_NAME]
         else:
             return []
 
diff --git a/obnamlib/clientlist_tests.py b/obnamlib/clientlist_tests.py
index a98bb088..b65e98ae 100644
--- a/obnamlib/clientlist_tests.py
+++ b/obnamlib/clientlist_tests.py
@@ -58,6 +58,7 @@ class ClientListTests(unittest.TestCase):
 
     def test_added_client_is_listed(self):
         self.list.add_client('foo')
+        self.list.set_client_keyid('foo', 'cafebeef')
         self.assertEqual(self.list.list_clients(), ['foo'])
 
     def test_removed_client_has_none_id(self):