mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Make some of the optional requirements optional for testing -- we'll skip the tests instead
This commit is contained in:
parent
abb93d9115
commit
0be531db71
2 changed files with 24 additions and 4 deletions
|
@ -5,8 +5,10 @@ jinja2
|
||||||
httplib2
|
httplib2
|
||||||
passlib
|
passlib
|
||||||
six
|
six
|
||||||
python-memcached
|
|
||||||
redis
|
# These are needed for various optional features
|
||||||
|
#python-memcached
|
||||||
|
#redis
|
||||||
|
|
||||||
# Test requirements
|
# Test requirements
|
||||||
unittest2
|
unittest2
|
||||||
|
|
|
@ -21,9 +21,25 @@ __metaclass__ = type
|
||||||
|
|
||||||
from ansible.compat.tests import unittest
|
from ansible.compat.tests import unittest
|
||||||
from ansible.plugins.cache.base import BaseCacheModule
|
from ansible.plugins.cache.base import BaseCacheModule
|
||||||
from ansible.plugins.cache.memcached import CacheModule as MemcachedCache
|
|
||||||
from ansible.plugins.cache.memory import CacheModule as MemoryCache
|
from ansible.plugins.cache.memory import CacheModule as MemoryCache
|
||||||
from ansible.plugins.cache.redis import CacheModule as RedisCache
|
|
||||||
|
HAVE_MEMCACHED = True
|
||||||
|
try:
|
||||||
|
import memcached
|
||||||
|
except ImportError:
|
||||||
|
HAVE_MEMCACHED = False
|
||||||
|
else:
|
||||||
|
# Use an else so that the only reason we skip this is for lack of
|
||||||
|
# memcached, not errors importing the plugin
|
||||||
|
from ansible.plugins.cache.memcached import CacheModule as MemcachedCache
|
||||||
|
|
||||||
|
HAVE_REDIS = True
|
||||||
|
try:
|
||||||
|
import redis
|
||||||
|
except ImportError:
|
||||||
|
HAVE_REDIS = False
|
||||||
|
else:
|
||||||
|
from ansible.plugins.cache.redis import CacheModule as RedisCache
|
||||||
|
|
||||||
|
|
||||||
class TestAbstractClass(unittest.TestCase):
|
class TestAbstractClass(unittest.TestCase):
|
||||||
|
@ -72,11 +88,13 @@ class TestAbstractClass(unittest.TestCase):
|
||||||
|
|
||||||
self.assertIsInstance(CacheModule3(), CacheModule3)
|
self.assertIsInstance(CacheModule3(), CacheModule3)
|
||||||
|
|
||||||
|
@unittest.skipUnless(HAVE_MEMCACHED)
|
||||||
def test_memcached_cachemodule(self):
|
def test_memcached_cachemodule(self):
|
||||||
self.assertIsInstance(MemcachedCache(), MemcachedCache)
|
self.assertIsInstance(MemcachedCache(), MemcachedCache)
|
||||||
|
|
||||||
def test_memory_cachemodule(self):
|
def test_memory_cachemodule(self):
|
||||||
self.assertIsInstance(MemoryCache(), MemoryCache)
|
self.assertIsInstance(MemoryCache(), MemoryCache)
|
||||||
|
|
||||||
|
@unittest.skipUnless(HAVE_REDIS)
|
||||||
def test_redis_cachemodule(self):
|
def test_redis_cachemodule(self):
|
||||||
self.assertIsInstance(RedisCache(), RedisCache)
|
self.assertIsInstance(RedisCache(), RedisCache)
|
||||||
|
|
Loading…
Reference in a new issue