Be smarter about memcached availability

1 files changed, 8 insertions, 1 deletions

diff --git a/cherrypy/test/test_session.py b/cherrypy/test/test_session.py
index 760ada73..20daa8c2 100755
--- a/cherrypy/test/test_session.py
+++ b/cherrypy/test/test_session.py
@@ -401,12 +401,19 @@ class SessionTest(helper.CPWebCase):
 
 
 @pytest.fixture(scope='session')
-def memcached_instance(request, watcher_getter):
+def memcached_instance(request):
     """
     Start up an instance of memcached.
     """
     pytest.importorskip('memcache')
 
+    try:
+        watcher_getter = request.getfixturevalue('watcher_getter')
+    except AttributeError as err:
+        if str(err) != 'You have to install memcached executable.':
+            raise
+        pytest.skip('memcached not available')
+
     port = portend.find_available_local_port()
 
     def is_occupied():