Juju Charms Collection
buildbot-master package

Merge lp://staging/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk

Proposed by Benji York on 2012-02-02

Status:	Merged
Approved by:	Brad Crittenden on 2012-02-02
Approved revision:	16
Merged at revision:	9
Proposed branch:	lp://staging/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot
Merge into:	lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Diff against target:	441 lines (+302/-73) 10 files modified .bzrignore (+5/-0) HACKING.txt (+23/-0) hooks/config-changed (+59/-40) hooks/helpers.py (+35/-0) hooks/install (+37/-20) hooks/start (+16/-12) hooks/tests.py (+83/-0) juju_wrapper (+19/-0) revision (+0/-1) tests/buildbot-master.test (+25/-0)
To merge this branch:	bzr merge lp://staging/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Brad Crittenden (community)		2012-02-02	Approve on 2012-02-02
Review via email: mp+91323@code.staging.launchpad.net

Description of the change

This branch translates the hooks from bash into Python, adds some hook/test helpers (with tests) and adds the first charm test.

Revision history for this message

Brad Crittenden (bac) wrote on 2012-02-02:

Hi Benji,

The Pythonization is great and overdue! And thanks for setting up a testing structure.

typo: s/about to being/about to begin/ (Several occurrences.)

line 119 is missing a comma, as I found out the hard way.

In my branch I've moved the definition of 'log' into the helpers.py. DRY.

The sleep at 431 seems awful aggressive given the long time it takes to deploy.

A lot of install and config-changed hooks I've already modified, so they were not reviewed too closely.

review: Approve

lp://staging/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot updated on 2012-02-02

17. By Benji York on 2012-02-02: ignore revision

Revision history for this message

Benji York (benji) wrote on 2012-02-02:

> typo: s/about to being/about to begin/ (Several occurrences.)

Thanks. Fixed.

> line 119 is missing a comma, as I found out the hard way.

Ooh! So it is. Automatic string concatenation isn't one of my favorite
Python features. Fixed.

> In my branch I've moved the definition of 'log' into the helpers.py.
> DRY.

Sounds good. I'll leave that for your branch so as not to increase the
already great chance of merge conflicts.

> The sleep at 431 seems awful aggressive given the long time it takes
> to deploy.

My reasoning was more focused on getting out of the loop faster than
worrying too much about how many times we go through the loop. I
believe that doing 10 "juju status" commands a second is so cheap as to
be negligible.

Thanks for the good review.

lp://staging/~benji/charms/oneiric/buildbot-master/buildbot-master-lpbuildbot updated on 2012-02-02