Added tests for worker.get_current_job().

This commit is contained in:
Selwin Ong 2014-03-06 08:57:50 +07:00
parent 1b3832adb5
commit 93bb9ec5f4
2 changed files with 16 additions and 3 deletions

View File

@ -254,7 +254,7 @@ class Worker(object):
if job_id is None: if job_id is None:
return None return None
return Job.safe_fetch(job_id) return Job.fetch(job_id, self.connection)
@property @property
def stopped(self): def stopped(self):

View File

@ -1,7 +1,6 @@
import os import os
from time import sleep
from tests import RQTestCase, slow from tests import RQTestCase, slow
from tests.fixtures import say_hello, div_by_zero, do_nothing, create_file, \ from tests.fixtures import say_hello, div_by_zero, create_file, \
create_file_after_timeout create_file_after_timeout
from tests.helpers import strip_microseconds from tests.helpers import strip_microseconds
from rq import Queue, Worker, get_failed_queue from rq import Queue, Worker, get_failed_queue
@ -250,3 +249,17 @@ class TestWorker(RQTestCase):
w.work(burst=True) w.work(burst=True)
job = Job.fetch(job.id) job = Job.fetch(job.id)
self.assertNotEqual(job.status, Status.FINISHED) self.assertNotEqual(job.status, Status.FINISHED)
def test_get_current_job(self):
"""Ensure worker.get_current_job() works properly"""
q = Queue()
worker = Worker([q])
job = q.enqueue_call(say_hello)
self.assertEqual(self.testconn.hget(worker.key, 'current_job'), None)
worker.set_job_id(job.id)
self.assertEqual(
worker.get_job_id(),
self.testconn.hget(worker.key, 'current_job')
)
self.assertEqual(worker.get_current_job(), job)