Merge lp:~benji/charms/oneiric/buildbot-master/more-tests into lp:~yellow/charms/oneiric/buildbot-master/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:~benji/charms/oneiric/buildbot-master/more-tests |
Merge into: | lp:~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:~benji/charms/oneiric/buildbot-master/more-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | code | Approve | |
Review via email: mp+92123@code.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-
- 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_
To post a comment you must log in.
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.