Merge lp://staging/~cr3/checkbox/pre-task-525.5 into lp://staging/checkbox/0.9
Proposed by
Marc Tardif
| Status: | Merged |
|---|---|
| Merged at revision: | 809 |
| Proposed branch: | lp://staging/~cr3/checkbox/pre-task-525.5 |
| Merge into: | lp://staging/checkbox/0.9 |
| Diff against target: |
6242 lines (+3652/-975) 72 files modified
apport/source_checkbox.py (+3/-0) backend (+5/-0) checkbox/application.py (+9/-6) checkbox/contrib/persist.py (+20/-13) checkbox/dispatcher.py (+201/-0) checkbox/job.py (+12/-3) checkbox/lib/bit.py (+8/-4) checkbox/lib/conversion.py (+131/-42) checkbox/lib/dmi.py (+169/-18) checkbox/lib/enum.py (+72/-0) checkbox/lib/fifo.py (+29/-4) checkbox/lib/log.py (+12/-3) checkbox/lib/process.py (+7/-5) checkbox/lib/safe.py (+5/-0) checkbox/lib/selector.py (+207/-0) checkbox/lib/template.py (+4/-1) checkbox/lib/template_i18n.py (+2/-1) checkbox/lib/transport.py (+85/-2) checkbox/lib/usb.py (+2/-0) checkbox/message.py (+21/-4) checkbox/parsers/cpuinfo.py (+180/-0) checkbox/parsers/cputable (+40/-0) checkbox/parsers/cputable.py (+42/-0) checkbox/parsers/deferred.py (+27/-0) checkbox/parsers/description.py (+74/-0) checkbox/parsers/device.py (+24/-0) checkbox/parsers/dmidecode.py (+123/-0) checkbox/parsers/meminfo.py (+46/-0) checkbox/parsers/submission.py (+540/-0) checkbox/parsers/tests/cputable.py (+74/-0) checkbox/parsers/tests/description.py (+146/-0) checkbox/parsers/tests/dmi.py (+80/-0) checkbox/parsers/tests/dmidecode.py (+60/-0) checkbox/parsers/tests/udevadm.py (+68/-0) checkbox/parsers/udevadm.py (+470/-0) checkbox/parsers/utils.py (+36/-0) checkbox/properties.py (+6/-1) checkbox/reactor.py (+16/-11) checkbox/report.py (+39/-12) checkbox/resource.py (+32/-13) checkbox/tests/report.py (+1/-1) checkbox/variables.py (+15/-1) checkbox_cli/cli_interface.py (+16/-9) debian/control (+1/-1) examples/checkbox.ini (+1/-1) jobs/resource.txt.in (+5/-0) plugins/apport_prompt.py (+20/-5) plugins/backend_info.py (+66/-15) plugins/jobs_info.py (+40/-8) plugins/jobs_prompt.py (+42/-4) plugins/lock_prompt.py (+14/-0) plugins/manual_test.py (+3/-1) plugins/message_info.py (+30/-1) plugins/persist_info.py (+7/-4) plugins/remote_suite.py (+1/-0) plugins/report_prompt.py (+7/-0) plugins/resource_info.py (+16/-2) plugins/scripts_info.py (+3/-1) plugins/shell_test.py (+3/-2) plugins/suites_prompt.py (+35/-20) plugins/system_info.py (+12/-4) plugins/user_interface.py (+6/-0) po/checkbox.pot (+67/-45) scripts/cdimage_resource (+2/-1) scripts/cpuinfo_resource (+18/-158) scripts/dmi_resource (+55/-0) scripts/gconf_resource (+1/-1) scripts/hal_resource (+0/-5) scripts/meminfo_resource (+15/-27) scripts/package_resource (+6/-0) scripts/udev_resource (+15/-514) setup.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~cr3/checkbox/pre-task-525.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brendan Donegan (community) | Approve | ||
| Marc Tardif (community) | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
This has been tested to build successfully and submit results to Launchpad. No errors encountered in the log when running.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Added python-dateutil to checkbox recommends, thanks!