Skip to content

Commit

Permalink
Make using Celery optional; default to not using Celery (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
pbaranay committed Jan 5, 2018
1 parent baa2792 commit c764b62
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 3 deletions.
16 changes: 16 additions & 0 deletions src/quade/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ def validate_access_test_func(val):
raise TypeError


def validate_boolean(val):
if isinstance(val, bool):
return val
else:
raise TypeError


class SettingsMeta(type):

def __new__(cls, name, bases, dct):
Expand Down Expand Up @@ -125,6 +132,15 @@ def __new__(cls, name, bases, dct):
accept one argument (a Django view class).""",
validator=validate_access_test_func
)
obj.define_setting(
name='use_celery',
default=False,
description="""Whether to use Celery to set up a Record.
Enabling this is useful if your fixtures take a long time to run.
""",
validator=validate_boolean,
)
return obj


Expand Down
5 changes: 4 additions & 1 deletion src/quade/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ def __init__(self, *args, **kwargs):
def execute_test(self, created_by):
scenario = self.cleaned_data['scenarios']
record = Record.objects.create(scenario=scenario, created_by=created_by)
execute_test_task.delay(record.id)
if settings.QUADE.use_celery:
execute_test_task.delay(record.id)
else:
record.execute_test()
return record


Expand Down
8 changes: 8 additions & 0 deletions tests/test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,16 @@ def test_settings_cannot_be_deleted(self):
with self.assertRaises(AttributeError):
del qs.fixtures_file


class TestAccessTestFunc(TestCase):

def test_callable_required(self):
with self.assertRaises(ImproperlyConfigured):
quade.Settings(access_test_func='Not a callable')


class TestUseCelery(TestCase):

def test_boolean_required(self):
with self.assertRaises(ImproperlyConfigured):
quade.Settings(use_celery='True')
27 changes: 27 additions & 0 deletions tests/test_tasks.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from __future__ import absolute_import, division, print_function, unicode_literals

from django.test import TestCase
from mock import mock

from quade import managers
from quade.models import Record
from quade.tasks import execute_test_task

from . import factories
from .mock import QuadeMock


class TestExecuteTask(TestCase):

def test_execute_unit(self):
record = factories.Record()
with mock.patch('quade.models.Record.execute_test') as mock_execute:
execute_test_task(record.id)
mock_execute.assert_called_once()

@QuadeMock(managers)
def test_execute_functional(self):
record = factories.Record(scenario__config=[('customer', {})])
execute_test_task(record.id)
record.refresh_from_db()
self.assertEqual(record.status, Record.Status.READY)
5 changes: 3 additions & 2 deletions tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ def test_execute(self):
)

@QuadeMock(managers)
def test_execute_is_async(self):
def test_execute_is_asynchronous_with_proper_setting(self):
scenario = factories.Scenario(config=[('customer', {})])
url = reverse('quade-main')
with mock.patch('quade.views.execute_test_task') as mock_task:
qs = quade.Settings(use_celery=True)
with mock.patch('quade.views.execute_test_task') as mock_task, override_settings(QUADE=qs):
self.app.post(url, params={'scenarios': scenario.slug})
new_record = Record.objects.last()
mock_task.delay.assert_called_once_with(new_record.id)
Expand Down

0 comments on commit c764b62

Please sign in to comment.