Checkbox

Merge lp://staging/~brendan-donegan/checkbox/story640_automation_squad_tests into lp://staging/checkbox

  1. story640_automation_squad_tests
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1721
Merged at revision: 1733
Proposed branch: lp://staging/~brendan-donegan/checkbox/story640_automation_squad_tests
Merge into: lp://staging/checkbox
Diff against target: 156 lines (+47/-20)
3 files modified
debian/changelog (+3/-1)
jobs/suspend.txt.in (+43/-18)
scripts/bluetooth_test (+1/-1)
To merge this branch: bzr merge lp://staging/~brendan-donegan/checkbox/story640_automation_squad_tests
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+127547@code.staging.launchpad.net

Description of the change

The main purpose of this merge is to fix the bluetooth_obex test definitions so that the command output is stripped of invalid characters. There are also one or two changes required to get things to behave correctly during the actual test runs, but there are no bug numbers for those.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Since translatable descriptions were added to this merge request, should the entry in the changelog be prefixed with [FEATURE] just to make life easier when backporting?

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Yeah, I keep forgetting that

lp://staging/~brendan-donegan/checkbox/story640_automation_squad_tests updated
1720. By Brendan Donegan

Add FEATURE to changelog entry to ease backporting, since descriptions are changed.

1721. By Brendan Donegan

Merged from trunk.

Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for FEATUREing it, looks good. Thanks!

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

Manually merged because tarmac didn't seem to do it for me :/

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

For future reference, it's because one of us forgot to set a commit message - I ought to have done it, but the reviewer also can and it unblocks tarmac and saves you from doing it manually.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches