Juju Charms Collection
buildbot-master package

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

  1. Oneiric (11.10)
  2. more-tests
  3. Merge into trunk
Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: 19
Merge reported by: Benji York
Merged at revision: not available
Proposed branch: lp://staging/~benji/charms/oneiric/buildbot-master/more-tests
Merge into: lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Diff against target: 375 lines (+229/-28)
5 files modified
HACKING.txt (+5/-1)
hooks/helpers.py (+45/-11)
hooks/tests.py (+26/-1)
tests/buildbot-master.test (+35/-15)
tests/test.cfg (+118/-0)
To merge this branch: bzr merge lp://staging/~benji/charms/oneiric/buildbot-master/more-tests
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+92123@code.staging.launchpad.net

Description of the change

This branch primarily adds a basic smoke test and fixes some bugs that
prevented the smoke test from passing.

- add a boostrap step to HACKING.txt
- change a (short circuiting) logical or into a bitwise
  (non-short-circuiting) or to fix a startup race condition
- add some log helpers for entering/exiting scripts
- spiff up the run() function so stderr doesn't leak to the console when
  running tests
- use a try/finally to be sure script exits are logged
- add a testing buildbot config

Tests:

Both test suites pass:

    python hooks/tests.py

    RESOLVE_TEST_CHARMS=1 tests/buildbot-master.test

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Hi Benji,

Some of this code already landed in my branch. Hope that doesn't complicate things.

Also, the branch I landed for gmb and frankban made changes to unit_info. You may want to look at what is in trunk before attempting the merge.

As we discussed this morning there is a move afoot to follow more of PEP-8 than LP coding style so perhaps you could update the tests to getRidOfCamelCase in_favor_of_underscores?

typo: occurs not ocurrs

redundant not redunant

There is now an 'encode_file' helper if you want to use it.

review: Approve (code)
lp://staging/~benji/charms/oneiric/buildbot-master/more-tests updated
20. By Benji York

fix spelling errors

21. By Benji York

merge from trunk and incorporate some review suggestions

22. By Benji York

simplify

23. By Benji York

use the encode_file helper

Revision history for this message
Benji York (benji) wrote :

> Also, the branch I landed for gmb and frankban made changes to unit_info. You
> may want to look at what is in trunk before attempting the merge.

Thanks for the heads-up. I was able to merge without too much trouble.

> As we discussed this morning there is a move afoot to follow more of PEP-8
> than LP coding style so perhaps you could update the tests to
> getRidOfCamelCase in_favor_of_underscores?

Good, I like underscores better. Done.

> typo: occurs not ocurrs
>
> redundant not redunant

Thanks. Fixed.

> There is now an 'encode_file' helper if you want to use it.

That feels like taking the helpers a bit far, but if we already have it,
I guess I'll follow along.

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

to all changes: