added catalog tests

2 files changed, 28 insertions, 2 deletions

diff --git a/keystonelight/backends/kvs.py b/keystonelight/backends/kvs.py
index e7f959b1..cbf17297 100644
--- a/keystonelight/backends/kvs.py
+++ b/keystonelight/backends/kvs.py
@@ -96,8 +96,9 @@ class KvsCatalog(object):
 
   # Public interface
   def get_catalog(self, user_id, tenant_id, extras=None):
-    return self.db.get('catalog-%s' % tenant_id)
+    return self.db.get('catalog-%s-%s' % (tenant_id, user_id))
 
   # Private interface
   def _create_catalog(self, user_id, tenant_id, data):
-    self.db.set('catalog-%s' % tenant_id, data)
+    self.db.set('catalog-%s-%s' % (tenant_id, user_id), data)
+    return data
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index 78575c3a..3561a13c 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -130,3 +130,28 @@ class KvsToken(test.TestCase):
     self.token_api.delete_token(token_id)
     deleted_data_ref = self.token_api.get_token(token_id)
     self.assert_(deleted_data_ref is None)
+
+
+class KvsCatalog(test.TestCase):
+  def setUp(self):
+    super(KvsCatalog, self).setUp()
+    options = self.appconfig('default')
+    self.catalog_api = kvs.KvsCatalog(options=options, db={})
+    self._load_fixtures()
+
+  def _load_fixtures(self):
+    self.catalog_foobar = self.catalog_api._create_catalog(
+        'foo', 'bar',
+        {'RegionFoo': {'service_bar': {'foo': 'bar'}}})
+
+  def test_get_catalog_bad_user(self):
+    catalog_ref = self.catalog_api.get_catalog('foo' + 'WRONG', 'bar')
+    self.assert_(catalog_ref is None)
+
+  def test_get_catalog_bad_tenant(self):
+    catalog_ref = self.catalog_api.get_catalog('foo', 'bar' + 'WRONG')
+    self.assert_(catalog_ref is None)
+
+  def test_get_catalog(self):
+    catalog_ref = self.catalog_api.get_catalog('foo', 'bar')
+    self.assertDictEquals(catalog_ref, self.catalog_foobar)