Fix tests

Author: sh4nks

.travis.yml

@@ -12,9 +12,6 @@ install:
  - pip install coveralls
  - pip install --editable .
 script: py.test
-services:
- - memcached
- - redis-server
 after_success:
   - coveralls
 cache: pip

flask_caching/backends/__init__.py

@@ -14,7 +14,8 @@
                                              SASLMemcachedCache,
                                              SpreadSASLMemcachedCache)
 from flask_caching.backends.null import NullCache
-from flask_caching.backends.redis import RedisCache, RedisSentinelCache
+# TODO: Rename to "redis" when python2 support is removed
+from flask_caching.backends.rediscache import RedisCache, RedisSentinelCache
 from flask_caching.backends.simple import SimpleCache
 
 try:

flask_caching/backends/redis.py renamed to flask_caching/backends/rediscache.py

@@ -63,12 +63,12 @@ def hash_method(request):
     return request.param
 
 
-@pytest.fixture
+@pytest.fixture(scope="session", autouse=True)
 def redis_server(xprocess):
     try:
         import redis
     except ImportError:
-        pytest.skip('Python package "redis" is not installed.')
+        pytest.skip("Python package 'redis' is not installed.")
 
     class Starter(ProcessStarter):
         pattern = "[Rr]eady to accept connections"

tests/conftest.py

@@ -15,7 +15,6 @@
 
 from flask_caching import backends
 from flask_caching._compat import text_type
-from xprocess import ProcessStarter
 
 try:
     import redis
@@ -214,27 +213,6 @@ def test_count_file_accuracy(self, c):
 class TestRedisCache(GenericCacheTests):
     _can_use_fast_sleep = False
 
-    @pytest.fixture(scope="class", autouse=True)
-    def requirements(self, xprocess):
-        if redis is None:
-            pytest.skip('Python package "redis" is not installed.')
-
-        class Starter(ProcessStarter):
-            pattern = "[Rr]eady to accept connections"
-            args = ["redis-server"]
-
-        try:
-            xprocess.ensure("redis_server", Starter)
-        except IOError as e:
-            # xprocess raises FileNotFoundError
-            if e.errno == errno.ENOENT:
-                pytest.skip("Redis is not installed.")
-            else:
-                raise
-
-        yield
-        xprocess.getinfo("redis_server").terminate()
-
     @pytest.fixture(params=(None, False, True))
     def make_cache(self, request):
         if request.param is None:

tests/test_backend_cache.py

@@ -77,7 +77,7 @@ def test_app_redis_cache_backend_url_default_db(app, redis_server):
     }
     cache = Cache()
     cache.init_app(app, config=config)
-    from flask_caching.backends.redis import RedisCache
+    from flask_caching.backends.rediscache import RedisCache
 
     assert isinstance(app.extensions["cache"][cache], RedisCache)
     rconn = app.extensions["cache"][