Skip to content

Commit 940a992

Browse files
committed
.
1 parent 30c9818 commit 940a992

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ install:
1010
script:
1111
- make syntax
1212
- python setup.py develop
13-
- pytest --cov-report term-missing --cov=aiocache -sv tests/ut
14-
- pytest -sv tests/acceptance
15-
- bash examples/run_all.sh
13+
- make cov
14+
- make acceptance
15+
- make functional
1616

1717
services:
1818
- redis-server

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ doc:
2525
make -C docs/ html
2626

2727
_functional:
28-
bash examples/run_all.sh
28+
python examples/lru_plugin.py
2929

3030
functional: dockerup _functional dockerdown
3131

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ You can also setup cache aliases like in Django settings:
6969
7070
import asyncio
7171
72-
from aiocache import settings, caches, SimpleMemoryCache, RedisCache
72+
from aiocache import caches, SimpleMemoryCache, RedisCache
7373
from aiocache.serializers import DefaultSerializer, PickleSerializer
7474
7575
# You can use either classes or strings for referencing classes
76-
settings.set_config({
76+
caches.set_config({
7777
'default': {
7878
'cache': "aiocache.SimpleMemoryCache",
7979
'serializer': {

tests/ut/conftest.py

+1-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import asynctest
33

44
from aiocache.base import BaseCache
5-
from aiocache import caches, settings, RedisCache, MemcachedCache
5+
from aiocache import caches, RedisCache, MemcachedCache
66
from aiocache.plugins import BasePlugin
77
from aiocache.serializers import DefaultSerializer
88

@@ -14,18 +14,6 @@ def pytest_namespace():
1414
}
1515

1616

17-
@pytest.fixture(autouse=True)
18-
def reset_settings():
19-
settings.set_config({
20-
'default': {
21-
'cache': "aiocache.SimpleMemoryCache",
22-
'serializer': {
23-
'class': "aiocache.serializers.DefaultSerializer"
24-
}
25-
}
26-
})
27-
28-
2917
@pytest.fixture(autouse=True)
3018
def reset_caches():
3119
caches.set_config({

0 commit comments

Comments
 (0)