removed SQS and IronMQ brokers for now

Both brokers are not atomic and cause all kinds of problems during testing. Needs more time.
Meanwhile I want to release the pluggable broker backend.

django_q/tests/tasks.py

@@ -1,7 +1,3 @@
-# simple countdown, returns nothing
-from time import sleep
-
-
 def countdown(n):
     while n > 0:
         n -= 1
@@ -26,11 +22,6 @@ def word_multiply(x, word=''):
     return len(word) * x
 
 
-def count_forever():
-    while True:
-        sleep(0.5)
-
-
 def get_task_name(task):
     return task.name
 

django_q/tests/test_brokers.py

@@ -11,9 +11,12 @@ def test_broker():
     broker.enqueue('test')
     broker.dequeue()
     broker.queue_size()
+    broker.purge_queue()
+    broker.delete('id')
     broker.delete_queue()
     broker.acknowledge('test')
     broker.ping()
+    broker.info()
     assert broker.get_stat('test_1') is None
     broker.set_stat('test_1', 'test', 3)
     assert broker.get_stat('test_1') == 'test'
@@ -24,6 +27,7 @@ def test_redis():
     Conf.DJANGO_REDIS = None
     broker = get_broker()
     assert broker.ping() is True
+    assert broker.info() is not None
     Conf.REDIS = {'host': '127.0.0.1', 'port': 7712}
     broker = get_broker()
     with pytest.raises(Exception):
@@ -32,15 +36,18 @@ def test_redis():
     Conf.DJANGO_REDIS = 'default'
 
 
-@pytest.mark.skipif(not os.getenv('DISQUE', None),
-                    reason="No disque server configured")
 def test_disque():
     Conf.DISQUE_NODES = ['127.0.0.1:7711']
+    Conf.DISQUE_AUTH = 'foobared'
     broker = get_broker(list_key='disque_test')
     assert broker.ping() is True
+    assert broker.info() is not None
+    # clear before we start
     broker.delete_queue()
+    # enqueue
     broker.enqueue('test')
     assert broker.queue_size() == 1
+    # dequeue
     task = broker.dequeue()
     assert task[1] == 'test'
     broker.acknowledge(task[0])
@@ -58,76 +65,21 @@ def test_disque():
     broker.acknowledge(task[0])
     sleep(1.5)
     assert broker.queue_size() == 0
+    # connection test
     Conf.DISQUE_NODES = ['127.0.0.1:7712', '127.0.0.1:7713']
     with pytest.raises(redis.exceptions.ConnectionError):
         broker.get_connection()
+    # delete job
+    task_id = broker.enqueue('test')
+    broker.delete(task_id)
+    assert broker.queue_size() == 0
+    # fail
+    task_id=broker.enqueue('test')
+    broker.fail(task_id)
+    # delete queue
+    broker.enqueue('test')
+    broker.enqueue('test')
     broker.delete_queue()
     assert broker.queue_size() == 0
     # back to django-redis
     Conf.DISQUE_NODES = None
-
-
-@pytest.mark.skipif(not os.getenv('AWS_ACCESS_KEY_ID'),
-                    reason="requires AWS SQS credentials")
-def test_sqs():
-    Conf.SQS = {'aws_access_key_id': os.getenv('AWS_ACCESS_KEY_ID'),
-                'aws_secret_access_key': os.getenv('AWS_SECRET_ACCESS_KEY'),
-                'region': os.getenv('SQS_REGION', 'eu-west-1')}
-    broker = get_broker(list_key='sqs_test')
-    assert broker.ping() is True
-    if broker.queue_size() > 0:
-        broker.purge_queue()
-    broker.enqueue('test')
-    task = broker.dequeue()
-    assert task[1] == 'test'
-    broker.acknowledge(task[0])
-    assert broker.queue_size() == 0
-    # Retry test
-    Conf.RETRY = 1
-    broker.enqueue('test')
-    broker.dequeue()
-    assert broker.queue_size() == 0
-    sleep(2)
-    # task should re-queue
-    assert broker.queue_size() == 1
-    task = broker.dequeue()
-    assert task[1] == 'test'
-    assert broker.acknowledge(task[0]) is True
-    assert broker.queue_size() == 0
-    broker.delete_queue()
-    # back to defaults
-    Conf.SQS = None
-
-
-@pytest.mark.skipif(not os.getenv('IRONMQ_TOKEN'),
-                    reason="requires IronMQ credentials")
-def test_ironmq():
-    Conf.IRONMQ = {'host': 'mq-aws-eu-west-1.iron.io',
-                   'token': os.getenv('IRONMQ_TOKEN'),
-                   'project_id': os.getenv('IRONMQ_PROJECT')}
-    broker = get_broker(list_key='djangoQ_test')
-    assert broker.ping() is True
-    broker.delete_queue()
-    broker.enqueue('test')
-    assert broker.queue_size() == 1
-    task = broker.dequeue()
-    assert task[1] == 'test'
-    broker.acknowledge(task[0])
-    assert broker.queue_size() == 0
-    # Retry test
-    Conf.RETRY = 1
-    broker.enqueue('test')
-    assert broker.queue_size() == 1
-    broker.dequeue()
-    assert broker.queue_size() == 0
-    sleep(2)
-    assert broker.queue_size() == 1
-    task = broker.dequeue()
-    assert broker.queue_size() == 0
-    broker.acknowledge(task[0])
-    sleep(2)
-    assert broker.queue_size() == 0
-    broker.delete_queue()
-    assert broker.queue_size() == 0
-    # back to django-redis
-    Conf.IRONMQ = None

django_q/tests/test_cluster.py

@@ -226,7 +226,8 @@ def test_async(broker, admin_user):
 def test_timeout(broker):
     # set up the Sentinel
     broker.list_key = 'timeout_test:q'
-    async('django_q.tests.tasks.count_forever',broker=broker)
+    broker.purge_queue()
+    async('django_q.tests.tasks.count_forever', broker=broker)
     start_event = Event()
     stop_event = Event()
     # Set a timer to stop the Sentinel
@@ -242,12 +243,13 @@ def test_timeout(broker):
 def test_timeout(broker):
     # set up the Sentinel
     broker.list_key = 'timeout_test:q'
+    broker.purge_queue()
     async('django_q.tests.tasks.count_forever', broker=broker)
     start_event = Event()
     stop_event = Event()
     # Set a timer to stop the Sentinel
     threading.Timer(3, stop_event.set).start()
-    s = Sentinel(stop_event, start_event,broker=broker, timeout=1)
+    s = Sentinel(stop_event, start_event, broker=broker, timeout=1)
     assert start_event.is_set()
     assert s.status() == Conf.STOPPED
     assert s.reincarnations == 1
@@ -284,7 +286,7 @@ def test_recycle(broker):
     Conf.WORKERS = 1
     # set a timer to stop the Sentinel
     threading.Timer(3, stop_event.set).start()
-    s = Sentinel(stop_event, start_event,broker=broker)
+    s = Sentinel(stop_event, start_event, broker=broker)
     assert start_event.is_set()
     assert s.status() == Conf.STOPPED
     assert s.reincarnations == 1
@@ -310,7 +312,7 @@ def test_recycle(broker):
 
 @pytest.mark.django_db
 def test_bad_secret(broker, monkeypatch):
-    broker.list_key='test_bad_secret:q'
+    broker.list_key = 'test_bad_secret:q'
     async('math.copysign', 1, -1, broker=broker)
     stop_event = Event()
     stop_event.set()

django_q/tests/test_config.py

@@ -1,10 +0,0 @@
-import pytest
-
-from django_q import conf
-
-
-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