diff --git a/.travis.yml b/.travis.yml index fd3b076..04b0434 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: python +services: + - redis-server + python: - "2.7" - "3.4" @@ -10,11 +13,11 @@ env: install: - pip install -q django==$DJANGO --use-mirrors - - pip install redis coveralls coloredlogs hiredis jsonpickle simplejson + - pip install redis coveralls coloredlogs hiredis jsonpickle simplejson --use-mirrors - python setup.py install script: - - coverage run --source=django_q setup.py test + - coverage run setup.py test after_success: - coveralls diff --git a/django_q/tests/test_qcluster.py b/django_q/tests/test_qcluster.py deleted file mode 100644 index e2d651c..0000000 --- a/django_q/tests/test_qcluster.py +++ /dev/null @@ -1,33 +0,0 @@ -import sys -import os -from time import sleep -from multiprocessing import Event - -myPath = os.path.dirname(os.path.abspath(__file__)) -sys.path.insert(0, myPath + '/../') - -import pytest -from django_q import Cluster -from django_q.main import Sentinel - - -@pytest.fixture(scope='session') -def cluster(): - return Cluster() - - -def test_cluster_initial(cluster): - assert cluster.sentinel is None - cluster.start() - assert cluster.sentinel.is_alive() is True - cluster.stop() - sleep(2) - assert cluster.sentinel.is_alive() is False - -def test_sentinel(): - event = Event() - sentinel = Sentinel(event) - sleep(1) - assert sentinel.monitor_pid > 0 - assert sentinel.pusher_pid > 0 - assert len(sentinel.pool) == sentinel.pool_size + 2 diff --git a/requirements.txt b/requirements.txt index 4a2ce40..fbca839 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,9 @@ -blessed -future --e . +blessed==1.9.5 coloredlogs==1.0.1 django-picklefield==0.3.1 Django==1.8.2 +future==0.14.3 hiredis==0.2.0 -humanfriendly==1.27 jsonpickle==0.9.2 -logutils==0.3.3 redis==2.10.3 + diff --git a/setup.py b/setup.py index f0001ad..8a25568 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ class PyTest(Command): user_options = [] def initialize_options(self): - pass + os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' def finalize_options(self): pass