Merge branch '0.8-maintenance'

djv · Mar 27, 2012 · fc972cb · fc972cb
2 parents ad5630c + 26e9cc7
commit fc972cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -39,6 +39,7 @@ Version 0.8.4
   used special methods properly.
 - Added a workaround to prevent the XSS protection from Chrome
   breaking the debugger.
+- Skip redis tests if redis is not running.
 
 Version 0.8.3
 -------------

diff --git a/werkzeug/testsuite/contrib/cache.py b/werkzeug/testsuite/contrib/cache.py
@@ -19,6 +19,11 @@
 
 try:
     import redis
+    try:
+        from redis.exceptions import ConnectionError as RedisConnectionError
+        cache.RedisCache(key_prefix='werkzeug-test-case:')._client.set('test','connection')
+    except RedisConnectionError:
+        redis = None
 except ImportError:
     redis = None