Fixed testcases.

tests/testapp/tests.py

@@ -168,21 +168,23 @@ class RedisCacheTests(unittest.TestCase):
     def test_set_expiration_timeout_None(self):
         key, value = 'key', 'value'
         self.cache.set(key, value);
-        self.assertTrue(self.cache._cache.ttl(key) > 0)
+        self.assertEqual(self.cache._cache.ttl(key), None)
+
 
     def test_set_expiration_timeout_0(self):
         key, value = 'key', 'value'
+        _key = self.cache.make_key(key)
         self.cache.set(key, value);
-        self.assertTrue(self.cache._cache.ttl(key) > 0)
+        self.assertTrue(self.cache._cache.ttl(_key) > 0)
         self.cache.expire(key, 0)
         self.assertEqual(self.cache.get(key), value)
-        self.assertTrue(self.cache._cache.ttl(key) < 0)
+        self.assertEqual(self.cache._cache.ttl(_key), None)
 
     def test_set_expiration_first_expire_call(self):
-        key, value = self.cache.prepare_key('key'), 'value'
+        key, value = self.cache.make_key('key'), 'value'
         # bypass public set api so we don't set the expiration
         self.cache._cache.set(key, pickle.dumps(value))
-        self.cache.expire(key, 1)
+        self.cache.expire('key', 1)
         time.sleep(2)
         self.assertEqual(self.cache.get('key'), None)