Skip to content

Commit

Permalink
Tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
ask committed Jun 28, 2011
1 parent c2a4bbe commit 523598f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion celery/tests/test_backends/test_redis_unit.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def test_on_chord_part_return(self, setresult):

b.client.incr.return_value = deps.total
b.on_chord_part_return(task)
deps.join.assert_called_with()
deps.join.assert_called_with(propagate=False)
deps.delete.assert_called_with()

self.assertTrue(b.client.expire.call_count)
Expand Down
8 changes: 4 additions & 4 deletions celery/tests/test_bin/test_celeryd.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ def test_cpu_count_no_mp(self):
self.assertEqual(cpu_count(), 2)

@skip_unless_module("multiprocessing")
def test_no_cpu_count(self, pcount):
def test_no_cpu_count(self):

@patch("multiprocessing.cpu_count")
def _do_test():
def _do_test(pcount):
pcount.side_effect = NotImplementedError("cpu_count")
from celery.apps.worker import cpu_count
self.assertEqual(cpu_count(), 2)
Expand All @@ -93,10 +93,10 @@ def test_process_name_wo_mp(self):
self.assertIsNone(get_process_name())

@skip_unless_module("multiprocessing")
def test_process_name_w_mp(self, current_process):
def test_process_name_w_mp(self):

@patch("multiprocessing.current_process")
def _do_test():
def _do_test(current_process):
from celery.apps.worker import get_process_name
self.assertTrue(get_process_name())

Expand Down
2 changes: 1 addition & 1 deletion celery/tests/test_task/test_chord.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class test_unlock_chord_task(AppCase):
def test_unlock_ready(self, retry, TaskSetResult):
callback = Mock()
result = Mock(attrs=dict(ready=lambda: True,
join=lambda: [2, 4, 8, 6]))
join=lambda **kw: [2, 4, 8, 6]))
TaskSetResult.restore = lambda setid: result
subtask, chords.subtask = chords.subtask, passthru
try:
Expand Down

0 comments on commit 523598f

Please sign in to comment.