Merge lp://qastaging/~dpb/landscape-charm/tests-process-profiles-1404008 into lp://qastaging/~landscape/landscape-charm/trunk
Proposed by
David Britton
| Status: | Merged |
|---|---|
| Approved by: | David Britton |
| Approved revision: | 214 |
| Merged at revision: | 213 |
| Proposed branch: | lp://qastaging/~dpb/landscape-charm/tests-process-profiles-1404008 |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
32 lines (+10/-4) 2 files modified
Makefile (+0/-1) tests/01-begin (+10/-3) |
| To merge this branch: | bzr merge lp://qastaging/~dpb/landscape-charm/tests-process-profiles-1404008 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Björn Tillenius (community) | Approve | ||
| Benji York (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Tests look for process_profiles or landscape_profiles for cron script name
Description of the change
makes the branch pass with trunk.
Easy way to test:
branch landscape trunk
make stage-landscape
cd build/landscape
bzr merge <this branch>
# ... follow normal instructions printed ...
# Once it's deployed, to run the tests:
cd build/landscape
SKIP_SLOW_TESTS=1 ./tests/01-begin
To post a comment you must log in.
Revision history for this message
| David Britton (dpb) wrote | # |
Revision history for this message
| Björn Tillenius (bjornt) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks good.
Some polish-level thoughts occurred to me while reading the code, so I subjected you to them.