artin/cement
1
0
Fork 0
mirror of https://github.com/datafolklabs/cement.git synced 2026-02-06 11:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Memcache/Redis Environment for Tests

Browse Source
This commit is contained in:
BJ Dierkes 2017-04-19 10:02:18 -05:00
parent 485ea035d4
commit 5560917a23
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -13,6 +13,9 @@ services:
links:
- redis:redis
- memcached:memcached
environment:
REDIS_HOST: redis
MEMCACHED_HOST: memcached
docs:
image: "cement-docs:dev"
build:

3
scripts/travis.sh
View File

@ -1,9 +1,6 @@
#!/bin/bash
set -e
export REDIS_HOST=localhost
export MEMCACHED_HOST=localhost
rm -f .coverage
pip install -r requirements-dev.txt
make test

20
tests/ext/test_memcached.py
View File

@ -6,10 +6,10 @@ from random import random
from cement.utils import test
from cement.utils.misc import init_defaults
if 'MEMCACHED_HOSTS' in os.environ.keys():
memcached_hosts = os.environ['MEMCACHED_HOSTS']
if 'MEMCACHED_HOST' in os.environ.keys():
memcached_host = os.environ['MEMCACHED_HOST']
else:
memcached_hosts = 'memcached'
memcached_host = 'localhost'
class MemcachedExtTestCase(test.CementTestCase):
@ -17,7 +17,7 @@ class MemcachedExtTestCase(test.CementTestCase):
super(MemcachedExtTestCase, self).setUp()
self.key = "cement-tests-random-key-%s" % random()
defaults = init_defaults('tests', 'cache.memcached')
defaults['cache.memcached']['hosts'] = 'memcached'
defaults['cache.memcached']['hosts'] = memcached_host
self.app = self.make_app('tests',
config_defaults=defaults,
extensions=['memcached'],
@ -30,7 +30,10 @@ class MemcachedExtTestCase(test.CementTestCase):
def test_memcache_list_type_config(self):
defaults = init_defaults('tests', 'cache.memcached')
defaults['cache.memcached']['hosts'] = ["127.0.0.1", "localhost"]
defaults['cache.memcached']['hosts'] = [
memcached_host,
memcached_host
]
self.app = self.make_app('tests',
config_defaults=defaults,
extensions=['memcached'],
@ -38,11 +41,12 @@ class MemcachedExtTestCase(test.CementTestCase):
)
self.app.setup()
self.eq(self.app.config.get('cache.memcached', 'hosts'),
['127.0.0.1', 'localhost'])
[memcached_host, memcached_host])
def test_memcache_str_type_config(self):
defaults = init_defaults('tests', 'cache.memcached')
defaults['cache.memcached']['hosts'] = "127.0.0.1,localhost"
defaults['cache.memcached']['hosts'] = "%s,%s" % (memcached_host,
memcached_host)
self.app = self.make_app('tests',
config_defaults=defaults,
extensions=['memcached'],
@ -50,7 +54,7 @@ class MemcachedExtTestCase(test.CementTestCase):
)
self.app.setup()
self.eq(self.app.config.get('cache.memcached', 'hosts'),
['127.0.0.1', 'localhost'])
[memcached_host, memcached_host])
def test_memcached_set(self):
self.app.cache.set(self.key, 1001)

2
tests/ext/test_redis.py
View File

@ -9,7 +9,7 @@ from cement.utils.misc import init_defaults
if 'REDIS_HOST' in os.environ.keys():
redis_host = os.environ['REDIS_HOST']
else:
redis_host = 'redis'
redis_host = 'localhost'
class RedisExtTestCase(test.CementTestCase):