Fix broken tests

main
Marcus Martins 10 years ago
parent 5b8726ad2d
commit ab6c129833

@ -2,8 +2,8 @@
from __future__ import (absolute_import, division, print_function, from __future__ import (absolute_import, division, print_function,
unicode_literals) unicode_literals)
import time
from datetime import datetime from datetime import datetime
import time
from tests import RQTestCase from tests import RQTestCase
from tests.helpers import strip_microseconds from tests.helpers import strip_microseconds
@ -16,7 +16,7 @@ from rq.registry import DeferredJobRegistry
from rq.utils import utcformat from rq.utils import utcformat
from rq.worker import Worker from rq.worker import Worker
import fixtures from . import fixtures
try: try:
from cPickle import loads, dumps from cPickle import loads, dumps
@ -104,8 +104,7 @@ class TestJob(RQTestCase):
job = Job.create(func='tests.fixtures.say_hello', args=('World',)) job = Job.create(func='tests.fixtures.say_hello', args=('World',))
# Job data is set # Job data is set
self.assertTrue(job.func.func_code.co_filename in fixtures.say_hello.func_code.co_filename) self.assertEquals(job.func, fixtures.say_hello)
self.assertEquals(job.func.func_code.co_firstlineno, fixtures.say_hello.func_code.co_firstlineno)
self.assertIsNone(job.instance) self.assertIsNone(job.instance)
self.assertEquals(job.args, ('World',)) self.assertEquals(job.args, ('World',))
@ -149,7 +148,7 @@ class TestJob(RQTestCase):
# Saving writes pickled job data # Saving writes pickled job data
unpickled_data = loads(self.testconn.hget(job.key, 'data')) unpickled_data = loads(self.testconn.hget(job.key, 'data'))
self.assertEquals(unpickled_data[0], 'fixtures.some_calculation') self.assertEquals(unpickled_data[0], 'tests.fixtures.some_calculation')
def test_fetch(self): def test_fetch(self):
"""Fetching jobs.""" """Fetching jobs."""
@ -290,9 +289,9 @@ class TestJob(RQTestCase):
job.save() job.save()
Job.fetch(job.id, connection=self.testconn) Job.fetch(job.id, connection=self.testconn)
if PY2: if PY2:
self.assertEqual(job.description, "fixtures.say_hello(u'Lionel')") self.assertEqual(job.description, "tests.fixtures.say_hello(u'Lionel')")
else: else:
self.assertEqual(job.description, "fixtures.say_hello('Lionel')") self.assertEqual(job.description, "tests.fixtures.say_hello('Lionel')")
def test_job_access_outside_job_fails(self): def test_job_access_outside_job_fails(self):
"""The current job is accessible only within a job context.""" """The current job is accessible only within a job context."""

Loading…
Cancel
Save