Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expanding coverage #26

Merged
merged 1 commit into from
Jul 20, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions django_q/tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'django_q'
'django_q',
'django_redis'
)

MIDDLEWARE_CLASSES = (
Expand Down Expand Up @@ -101,8 +102,21 @@

STATIC_URL = '/static/'

# Django Redis
CACHES = {
"default": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": "redis://127.0.0.1:6379/0",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
"PARSER_CLASS": "redis.connection.HiredisParser",
}
}
}

# Django Q specific
Q_CLUSTER = {'name': 'django_q_test',
'cpu_affinity': 1,
'testing': True,
'log_level': 'DEBUG'}
'log_level': 'DEBUG',
'django_redis': 'default'}
24 changes: 24 additions & 0 deletions django_q/tests/test_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from django_q.tasks import fetch, fetch_group, async, result, result_group, count_group, delete_group
from django_q.models import Task
from django_q.conf import Conf, redis_client
from django_q.monitor import Stat
from .tasks import multiply


Expand Down Expand Up @@ -282,6 +283,29 @@ def test_recycle(r):
r.delete(list_key)


@pytest.mark.django_db
def test_bad_secret(r, monkeypatch):
list_key = 'test_bad_secret'
async('math.copysign', 1, -1, list_key=list_key)
stop_event = Event()
stop_event.set()
start_event = Event()
s = Sentinel(stop_event, start_event, list_key=list_key, start=False)
Stat(s).save()
# change the SECRET
monkeypatch.setattr(Conf, "SECRET_KEY", "OOPS")
stat = Stat.get_all(r)
assert len(stat) == 0
assert Stat.get(s.parent_pid, r) is None
task_queue = Queue()
pusher(task_queue, stop_event, list_key=list_key, r=r)
result_queue = Queue()
task_queue.put('STOP')
worker(task_queue, result_queue, Value('b', -1), )
assert result_queue.qsize() == 0
r.delete(list_key)


@pytest.mark.django_db
def assert_result(task):
assert task is not None
Expand Down
15 changes: 15 additions & 0 deletions django_q/tests/test_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import pytest

from django_q import conf


@pytest.fixture
def r():
return conf.redis_client


def test_django_redis():
conf.Conf.DJANGO_REDIS = None
assert conf.redis_client.ping() is True
conf.Conf.DJANGO_REDIS = 'default'
assert conf.redis_client.ping() is True
5 changes: 4 additions & 1 deletion django_q/tests/test_monitor.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from django_q.cluster import Cluster
from django_q.monitor import monitor
from django_q.monitor import monitor, Stat


def test_monitor():
assert Stat.get(0).sentinel == 0
c = Cluster()
c.start()
stats = monitor(run_once=True)
Expand All @@ -12,5 +13,7 @@ def test_monitor():
for stat in stats:
if stat.cluster_id == c.pid:
found_c = True
assert stat.uptime() > 0
assert stat.empty_queues() is True
break
assert found_c is True
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ future==0.14.3
hiredis==0.2.0
redis==2.10.3
psutil==3.1.1
django-redis==4.2.0