Merge lp://qastaging/~free.ekanayaka/landscape-charm/fix-cleanup-in-ha-integration-tests into lp://qastaging/~landscape/landscape-charm/trunk
| Status: | Merged |
|---|---|
| Approved by: | Free Ekanayaka |
| Approved revision: | 365 |
| Merged at revision: | 367 |
| Proposed branch: | lp://qastaging/~free.ekanayaka/landscape-charm/fix-cleanup-in-ha-integration-tests |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
293 lines (+69/-40) 6 files modified
tests/basic/test_actions.py (+1/-3) tests/basic/test_ha.py (+21/-21) tests/basic/test_service.py (+16/-4) tests/helpers.py (+29/-7) tests/layers.py (+1/-1) tests/test_helpers.py (+1/-4) |
| To merge this branch: | bzr merge lp://qastaging/~free.ekanayaka/landscape-charm/fix-cleanup-in-ha-integration-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Collard (community) | Approve | ||
| Alberto Donato (community) | Approve | ||
| 🤖 Landscape Builder | test results | Approve | |
|
Review via email:
|
|||
Commit message
This branch fixes LandscapeHATest tests that relied on
stop_landscape_
service being stopped at test cleanup time. However that
wasn't quite happening since the EnvironmentFixture gets
set up at layer set up time and cleaned up at layer tear
down time (so not for every test).
As drive by, the branch also cleans up the ActionsTest.
test which had been marked with an XXX comment because
of Bug #1598016, which is now fix in landscape.
It also speeds up the test that runs the hash-ids cron
script by replacing the regular hash-ids config with
a sample one which doesn't point to the full Ubuntu
archives but rather to a test PPA.
Description of the change
This branch fixes LandscapeHATest tests that relied on
stop_landscape_
service being stopped at test cleanup time. However that
wasn't quite happening since the EnvironmentFixture gets
set up at layer set up time and cleaned up at layer tear
down time (so not for every test).
As drive by, the branch also cleans up the ActionsTest.
test which had been marked with an XXX comment because
of Bug #1598016, which is now fix in landscape.
It also speeds up the test that runs the hash-ids cron
script by replacing the regular hash-ids config with
a sample one which doesn't point to the full Ubuntu
archives but rather to a test PPA.
| 🤖 Landscape Builder (landscape-builder) | # |
| 🤖 Landscape Builder (landscape-builder) wrote | # |
Command: make ci-test
Result: Success
Revno: 365
Branch: lp:~free.ekanayaka/landscape-charm/fix-cleanup-in-ha-integration-tests
Jenkins: https:/