From 785ba396bbfe76bdc2d75ef6f0f437b24d998efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Borgstr=C3=B6m?= Date: Sat, 2 Jul 2011 20:39:22 +0200 Subject: [PATCH] Fix store test case --- darc/store.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/darc/store.py b/darc/store.py index 441b68206..322a9d28d 100644 --- a/darc/store.py +++ b/darc/store.py @@ -205,8 +205,8 @@ class Store(object): raise self.DoesNotExist def list(self, ns, marker=None, limit=1000000): - return (key for (key, value) in - self.get_index(ns).iteritems(marker=marker, limit=limit)) + for key, value in self.get_index(ns).iteritems(marker=marker, limit=limit): + yield key class BandIO(object): @@ -334,7 +334,7 @@ class StoreTestCase(unittest.TestCase): self.store.close() store2 = Store(os.path.join(self.tmppath, 'store')) self.assertEqual(store2.tid, 1) - keys = store2.list(0) + keys = list(store2.list(0)) for x in range(50): key = '%-32d' % x self.assertEqual(store2.get(0, key), 'SOMEDATA') @@ -348,11 +348,11 @@ class StoreTestCase(unittest.TestCase): for x in range(50): key = '%-32d' % x store2.delete(0, key) - self.assertEqual(len(store2.list(0)), 49) + self.assertEqual(len(list(store2.list(0))), 49) for x in range(51, 100): key = '%-32d' % x store2.delete(0, key) - self.assertEqual(len(store2.list(0)), 0) + self.assertEqual(len(list(store2.list(0))), 0) def suite():