Merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-14-tests into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | 34 |
Merged at revision: | 32 |
Proposed branch: | lp://staging/~frankban/charms/oneiric/buildbot-master/02-14-tests |
Merge into: | lp://staging/~yellow/charms/oneiric/buildbot-master/trunk |
Diff against target: |
46 lines (+6/-5) 2 files modified
hooks/config-changed (+0/-1) hooks/install (+6/-4) |
To merge this branch: | bzr merge lp://staging/~frankban/charms/oneiric/buildbot-master/02-14-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | Approve | ||
Review via email: mp+93032@code.staging.launchpad.net |
Description of the change
*Changes from frankban and gmb*:
The `cleanup` function in the install hook now stops (if running) buildbot using the installdir previously stored in the config JSON file.
*Tests*:
$ RESOLVE_
test_lpbuildbot (__main_
test_port_opened (__main_
-------
Ran 2 tests in 358.658s
OK
To post a comment you must log in.