Merge lp://staging/~brendan-donegan/checkbox/verification_interaction_jobs into lp://staging/checkbox
Status: | Merged |
---|---|
Approved by: | Daniel Manrique |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1784 |
Proposed branch: | lp://staging/~brendan-donegan/checkbox/verification_interaction_jobs |
Merge into: | lp://staging/checkbox |
Diff against target: |
167 lines (+38/-24) 5 files modified
debian/changelog (+3/-0) jobs/graphics.txt.in (+1/-1) jobs/usb.txt.in (+1/-1) plugins/jobs_prompt.py (+28/-21) plugins/manual_test.py (+5/-1) |
To merge this branch: | bzr merge lp://staging/~brendan-donegan/checkbox/verification_interaction_jobs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Approve | ||
Brendan Donegan (community) | Needs Resubmitting | ||
Review via email: mp+130388@code.staging.launchpad.net |
Commit message
Allow verification and interaction to be used as aliases for 'manual' in job plugin fields
Description of the change
At the moment there are two different types of test job types - shell and manual. The problem with this is that manual tests may actually be partly automated by having only the verification of the correct result being performed by the tester, or alternatively by having the tester perform some action and the verification be done automatically. These should be distinguished from pure manual jobs and in the long run, actually be handled in a different way.
This merge merely creates the aliases 'verification' and 'interaction' for manual tests, and Checkbox will otherwise treat jobs with this 'plugin' exactly the same. In future it will be possible to implement functionality that actually causes jobs with these types to behave differently. Also for example purposes, two jobs have been converted to this type, both for testing and to kick off the process of converting jobs to use the appropriate type.
Oh, and to avoid confusion, I also pep8 cleaned the code
Awesome!
I can suggest a simplification (actually Marc did a few months ago):
you just have to register handlers with the appropriate regex. in the manual_test plugin: ("prompt- (manual| interactive| verification| monkey) ", self.prompt_ manual) ,
This should remove the need for the plugin_alias method and simplify a few other lines of the code, as well as keeping the definitions of the types of jobs each plugin can handle in the plugin itself, which I think is slightly cleaner.
I'll set this as Needs Fixing but this is certainly not set in stone, if you prefer your approach I'm OK.