Merge lp:~frankban/charms/oneiric/buildbot-slave/tests_again into lp:~yellow/charms/oneiric/buildbot-slave/trunk
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | 11 |
Merged at revision: | 10 |
Proposed branch: | lp:~frankban/charms/oneiric/buildbot-slave/tests_again |
Merge into: | lp:~yellow/charms/oneiric/buildbot-slave/trunk |
Diff against target: |
185 lines (+56/-63) 2 files modified
hooks/install (+2/-2) tests/buildbot-slave.test (+54/-61) |
To merge this branch: | bzr merge lp:~frankban/charms/oneiric/buildbot-slave/tests_again |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | code | Approve | |
Review via email: mp+92256@code.launchpad.net |
Description of the change
- buildslave charm tests refactoring
- using run function to chmod the script in install hook
- changed symlinks (helpers.py, tests.cfg)
To post a comment you must log in.
82 + wait_for_ unit(service_ name, timeout=600)
We should probably add an XXX here to remind ourselves to try and either bring this down or do something smarter with it depending on the state of the Juju environment.