lazr.jobrunner

Merge lp:~abentley/lazr.jobrunner/fix-celeryd-tests into lp:lazr.jobrunner

  1. fix-celeryd-tests
  2. Merge into trunk
Proposed by Aaron Bentley on 2012-03-26
Status: Merged
Merged at revision: 24
Proposed branch: lp:~abentley/lazr.jobrunner/fix-celeryd-tests
Merge into: lp:lazr.jobrunner
Diff against target: 13 lines (+1/-2)
1 file modified
src/lazr/jobrunner/tests/test_celerytask.py (+1/-2)
To merge this branch: bzr merge lp:~abentley/lazr.jobrunner/fix-celeryd-tests
Reviewer Review Type Date Requested Status
Deryck Hodge (community) 2012-03-26 Approve on 2012-03-26
Review via email: mp+99378@code.launchpad.net

Commit Message

Fix celeryd tests by declaring file_job as class variable

Description of the Change

This branch fixes the celeryd tests, which use FileJob. RunFileJob instances require file_job_dir to be set correctly, which is done for celeryd using CELERY_ANNOTATIONS. This mechanism sets class variables, not instance variables. My recent landings provided file_job_dir as an instance variable, so it overrode the value set by CELERY_ANNOTATIONS. This branch fixes the tests by declaring file_job_dir as a class variable.

To post a comment you must log in.
Deryck Hodge (deryck) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lazr/jobrunner/tests/test_celerytask.py'
2--- src/lazr/jobrunner/tests/test_celerytask.py 2012-03-22 18:02:23 +0000
3+++ src/lazr/jobrunner/tests/test_celerytask.py 2012-03-26 17:18:19 +0000
4@@ -171,8 +171,7 @@
5
6 name = 'run_file_job'
7
8- def __init__(self):
9- self.file_job_dir = None
10+ file_job_dir = None
11
12 @property
13 def job_source(self):

Subscribers

People subscribed via source and target branches

to all changes: