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
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_CHARMS=1 tests/buildbot-master.test -v
test_lpbuildbot (__main__.TestCharm) ... ok
test_port_opened (__main__.TestCharm) ... ok

----------------------------------------------------------------------
Ran 2 tests in 358.658s

OK

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve

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