added tests for tokens

2 files changed, 26 insertions, 0 deletions

diff --git a/keystonelight/backends/kvs.py b/keystonelight/backends/kvs.py
index 7bc338b1..e7f959b1 100644
--- a/keystonelight/backends/kvs.py
+++ b/keystonelight/backends/kvs.py
@@ -70,6 +70,8 @@ class KvsToken(object):
   def __init__(self, options, db=None):
     if db is None:
       db = INMEMDB
+    elif type(db) is type({}):
+      db = DictKvs(db)
     self.db = db
 
   # Public interface
@@ -88,6 +90,8 @@ class KvsCatalog(object):
   def __init__(self, options, db=None):
     if db is None:
       db = INMEMDB
+    elif type(db) is type({}):
+      db = DictKvs(db)
     self.db = db
 
   # Public interface
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index 718c0478..78575c3a 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -1,3 +1,4 @@
+import uuid
 
 from keystonelight import models
 from keystonelight import test
@@ -108,3 +109,24 @@ class KvsIdentity(test.TestCase):
         user_id=self.user_foo['id'],
         tenant_id=self.tenant_bar['id'])
     self.assertDictEquals(extras_ref, self.extras_foobar)
+
+
+class KvsToken(test.TestCase):
+  def setUp(self):
+    super(KvsToken, self).setUp()
+    options = self.appconfig('default')
+    self.token_api = kvs.KvsToken(options=options, db={})
+
+  def test_token_crud(self):
+    token_id = uuid.uuid4().hex
+    data = {'id': token_id,
+            'a': 'b'}
+    data_ref = self.token_api.create_token(token_id, data)
+    self.assertDictEquals(data_ref, data)
+
+    new_data_ref = self.token_api.get_token(token_id)
+    self.assertEquals(new_data_ref, data)
+
+    self.token_api.delete_token(token_id)
+    deleted_data_ref = self.token_api.get_token(token_id)
+    self.assert_(deleted_data_ref is None)