mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-02 20:28:11 +08:00
Build improvements (#569)
* Black linting * Adding Black to dev dependencies and upping minimal python to 3.6.2 for compatibility * Updating packages * Removing pip-tools input and exporting requirements with poetry * Deleting old setup files and test runner * Trying 1.3.7 * Looser extras requirements to prevent conflicts * Sorted imports with isort * Added iSort to dev dependencies * Fixes localtime for naive setups
This commit is contained in:
Ilan Steemers
@@ -2,17 +2,30 @@ from multiprocessing import Event, Value
|
||||
|
||||
import pytest
|
||||
|
||||
from django_q.cluster import pusher, worker, monitor
|
||||
from django_q.conf import Conf
|
||||
from django_q.tasks import async_task, result, fetch, count_group, result_group, fetch_group, delete_group, delete_cached, \
|
||||
async_iter, Chain, async_chain, Iter, AsyncTask
|
||||
from django_q.brokers import get_broker
|
||||
from django_q.cluster import monitor, pusher, worker
|
||||
from django_q.conf import Conf
|
||||
from django_q.queues import Queue
|
||||
from django_q.tasks import (
|
||||
AsyncTask,
|
||||
Chain,
|
||||
Iter,
|
||||
async_chain,
|
||||
async_iter,
|
||||
async_task,
|
||||
count_group,
|
||||
delete_cached,
|
||||
delete_group,
|
||||
fetch,
|
||||
fetch_group,
|
||||
result,
|
||||
result_group,
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def broker(monkeypatch):
|
||||
monkeypatch.setattr(Conf, 'DJANGO_REDIS', 'default')
|
||||
monkeypatch.setattr(Conf, "DJANGO_REDIS", "default")
|
||||
return get_broker()
|
||||
|
||||
|
||||
@@ -20,16 +33,16 @@ def broker(monkeypatch):
|
||||
def test_cached(broker):
|
||||
broker.purge_queue()
|
||||
broker.cache.clear()
|
||||
group = 'cache_test'
|
||||
group = "cache_test"
|
||||
# queue the tests
|
||||
task_id = async_task('math.copysign', 1, -1, cached=True, broker=broker)
|
||||
async_task('math.copysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task('math.copysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task('math.copysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task('math.copysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task('math.copysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task('math.popysign', 1, -1, cached=True, broker=broker, group=group)
|
||||
iter_id = async_iter('math.floor', [i for i in range(10)], cached=True)
|
||||
task_id = async_task("math.copysign", 1, -1, cached=True, broker=broker)
|
||||
async_task("math.copysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task("math.copysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task("math.copysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task("math.copysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task("math.copysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
async_task("math.popysign", 1, -1, cached=True, broker=broker, group=group)
|
||||
iter_id = async_iter("math.floor", [i for i in range(10)], cached=True)
|
||||
# test wait on cache
|
||||
# test wait timeout
|
||||
assert result(task_id, wait=10, cached=True) is None
|
||||
@@ -48,11 +61,11 @@ def test_cached(broker):
|
||||
pusher(task_queue, stop_event, broker=broker)
|
||||
assert broker.queue_size() == 0
|
||||
assert task_queue.qsize() == task_count
|
||||
task_queue.put('STOP')
|
||||
task_queue.put("STOP")
|
||||
result_queue = Queue()
|
||||
worker(task_queue, result_queue, Value('f', -1))
|
||||
worker(task_queue, result_queue, Value("f", -1))
|
||||
assert result_queue.qsize() == task_count
|
||||
result_queue.put('STOP')
|
||||
result_queue.put("STOP")
|
||||
monitor(result_queue)
|
||||
assert result_queue.qsize() == 0
|
||||
# assert results
|
||||
@@ -85,10 +98,10 @@ def test_iter(broker):
|
||||
it = [i for i in range(10)]
|
||||
it2 = [(1, -1), (2, -1), (3, -4), (5, 6)]
|
||||
it3 = (1, 2, 3, 4, 5)
|
||||
t = async_iter('math.floor', it, sync=True)
|
||||
t2 = async_iter('math.copysign', it2, sync=True)
|
||||
t3 = async_iter('math.floor', it3, sync=True)
|
||||
t4 = async_iter('math.floor', (1,), sync=True)
|
||||
t = async_iter("math.floor", it, sync=True)
|
||||
t2 = async_iter("math.copysign", it2, sync=True)
|
||||
t3 = async_iter("math.floor", it3, sync=True)
|
||||
t4 = async_iter("math.floor", (1,), sync=True)
|
||||
result_t = result(t)
|
||||
assert result_t is not None
|
||||
task_t = fetch(t)
|
||||
@@ -97,7 +110,7 @@ def test_iter(broker):
|
||||
assert result(t3) is not None
|
||||
assert result(t4)[0] == 1
|
||||
# test iter class
|
||||
i = Iter('math.copysign', sync=True, cached=True)
|
||||
i = Iter("math.copysign", sync=True, cached=True)
|
||||
i.append(1, -1)
|
||||
i.append(2, -1)
|
||||
i.append(3, -4)
|
||||
@@ -118,9 +131,9 @@ def test_chain(broker):
|
||||
broker.purge_queue()
|
||||
broker.cache.clear()
|
||||
task_chain = Chain(sync=True)
|
||||
task_chain.append('math.floor', 1)
|
||||
task_chain.append('math.copysign', 1, -1)
|
||||
task_chain.append('math.floor', 2)
|
||||
task_chain.append("math.floor", 1)
|
||||
task_chain.append("math.copysign", 1, -1)
|
||||
task_chain.append("math.floor", 2)
|
||||
assert task_chain.length() == 3
|
||||
assert task_chain.current() is None
|
||||
task_chain.run()
|
||||
@@ -130,7 +143,7 @@ def test_chain(broker):
|
||||
t = task_chain.fetch()
|
||||
assert len(t) == task_chain.length()
|
||||
task_chain.cached = True
|
||||
task_chain.append('math.floor', 3)
|
||||
task_chain.append("math.floor", 3)
|
||||
assert task_chain.length() == 4
|
||||
task_chain.run()
|
||||
r = task_chain.result(wait=1000)
|
||||
@@ -139,16 +152,20 @@ def test_chain(broker):
|
||||
t = task_chain.fetch()
|
||||
assert len(t) == task_chain.length()
|
||||
# test single
|
||||
rid = async_chain(['django_q.tests.tasks.hello', 'django_q.tests.tasks.hello'], sync=True, cached=True)
|
||||
assert result_group(rid, cached=True) == ['hello', 'hello']
|
||||
rid = async_chain(
|
||||
["django_q.tests.tasks.hello", "django_q.tests.tasks.hello"],
|
||||
sync=True,
|
||||
cached=True,
|
||||
)
|
||||
assert result_group(rid, cached=True) == ["hello", "hello"]
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_asynctask_class(broker, monkeypatch):
|
||||
broker.purge_queue()
|
||||
broker.cache.clear()
|
||||
a = AsyncTask('math.copysign')
|
||||
assert a.func == 'math.copysign'
|
||||
a = AsyncTask("math.copysign")
|
||||
assert a.func == "math.copysign"
|
||||
a.args = (1, -1)
|
||||
assert a.started is False
|
||||
a.cached = True
|
||||
@@ -161,29 +178,34 @@ def test_asynctask_class(broker, monkeypatch):
|
||||
assert a.result() == -1
|
||||
assert a.fetch().result == -1
|
||||
# again with kwargs
|
||||
a = AsyncTask('math.copysign', 1, -1, cached=True, sync=True, broker=broker)
|
||||
a = AsyncTask("math.copysign", 1, -1, cached=True, sync=True, broker=broker)
|
||||
a.run()
|
||||
assert a.result() == -1
|
||||
# with q_options
|
||||
a = AsyncTask('math.copysign', 1, -1, q_options={'cached': True, 'sync': False, 'broker': broker})
|
||||
a = AsyncTask(
|
||||
"math.copysign",
|
||||
1,
|
||||
-1,
|
||||
q_options={"cached": True, "sync": False, "broker": broker},
|
||||
)
|
||||
assert not a.sync
|
||||
a.sync = True
|
||||
assert a.kwargs['q_options']['sync'] is True
|
||||
assert a.kwargs["q_options"]["sync"] is True
|
||||
a.run()
|
||||
assert a.result() == -1
|
||||
a.group = 'async_class_test'
|
||||
assert a.group == 'async_class_test'
|
||||
a.group = "async_class_test"
|
||||
assert a.group == "async_class_test"
|
||||
a.save = False
|
||||
assert not a.save
|
||||
a.hook = 'djq.tests.tasks.hello'
|
||||
assert a.hook == 'djq.tests.tasks.hello'
|
||||
a.hook = "djq.tests.tasks.hello"
|
||||
assert a.hook == "djq.tests.tasks.hello"
|
||||
assert a.started is False
|
||||
a.run()
|
||||
assert a.result_group() == [-1]
|
||||
assert a.fetch_group() == [a.fetch()]
|
||||
# global overrides
|
||||
monkeypatch.setattr(Conf, 'SYNC', True)
|
||||
monkeypatch.setattr(Conf, 'CACHED', True)
|
||||
a = AsyncTask('math.floor', 1.5)
|
||||
monkeypatch.setattr(Conf, "SYNC", True)
|
||||
monkeypatch.setattr(Conf, "CACHED", True)
|
||||
a = AsyncTask("math.floor", 1.5)
|
||||
a.run()
|
||||
assert a.result() == 1
|
||||
|
||||
Reference in New Issue
Block a user