Merge lp://qastaging/~bjornt/landscape-charm/integration-tests-no-hardcode-unit into lp://qastaging/~landscape/landscape-charm/trunk
| Status: | Merged |
|---|---|
| Approved by: | Björn Tillenius |
| Approved revision: | 321 |
| Merged at revision: | 310 |
| Proposed branch: | lp://qastaging/~bjornt/landscape-charm/integration-tests-no-hardcode-unit |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
252 lines (+61/-34) 3 files modified
tests/basic/test_service.py (+13/-13) tests/helpers.py (+46/-21) tests/layers.py (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~bjornt/landscape-charm/integration-tests-no-hardcode-unit |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Collard (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
| Free Ekanayaka (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Don't hardcode the unit ids in the integration tests.
The tests assumed that landscape-server/0 was always there. This is not
always true, especially not when we'll add a layer that destroys that
unit.
I also changed it so that error output is included from the 'juju ssh'
calls. Error output from the cron scripts was already included, but if
the actualy 'juju ssh' call failed, all you saw that the command exited
with error code 1, but you didn't see what the actual problem was.
Description of the change
Don't hardcode the unit ids in the integration tests.
The tests assumed that landscape-server/0 was always there. This is not
always true, especially not when we'll add a layer that destroys that
unit.
I have a branch where I add such a layer, which shows the problem solved
by this branch. But to reproduce it, what you can do is to take an
existing deploy and destroy all the machines. If you run the following
it will fail in trunk, but pass with this branch:
LS_
I also changed it so that error output is included from the 'juju ssh'
calls. Error output from the cron scripts was already included, but if
the actualy 'juju ssh' call failed, all you saw that the command exited
with error code 1, but you didn't see what the actual problem was.
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| Björn Tillenius (bjornt) | # |
| Björn Tillenius (bjornt) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
| Björn Tillenius (bjornt) | # |
Command: make ci-test
Result: Success
Revno: 319
Branch: lp:~bjornt/landscape-charm/integration-tests-no-hardcode-unit
Jenkins: https:/