Landscape Charm

Merge lp://qastaging/~bjornt/landscape-charm/reenable-LandscapeLeaderDestroyedLayer into lp://qastaging/~landscape/landscape-charm/trunk

  1. reenable-LandscapeLeaderDestroyedLayer
  2. Merge into trunk
Proposed by Björn Tillenius
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 359
Merged at revision: 358
Proposed branch: lp://qastaging/~bjornt/landscape-charm/reenable-LandscapeLeaderDestroyedLayer
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 54 lines (+12/-8)
2 files modified
tests/basic/test_leader.py (+2/-4)
tests/layers.py (+10/-4)
To merge this branch: bzr merge lp://qastaging/~bjornt/landscape-charm/reenable-LandscapeLeaderDestroyedLayer
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
🤖 Landscape Builder test results Approve
Chris Glass (community) Approve
Review via email: mp+298878@code.qastaging.launchpad.net

Commit message

Reenable the LandscapeLeaderDestroyedLayer integration tests.

The bug that prevented those tests from passing has long been fixed in
Juju.

This branch also fixes OneLandscapeUnitLayer so that it doesn't clean up the
environment after every test, which caused a lot of test failures.

Description of the change

Reenable the LandscapeLeaderDestroyedLayer integration tests.

The bug that prevented those tests from passing has long been fixed in
Juju.

I also fixed OneLandscapeUnitLayer so that it doesn't clean up the
environment after every test, which caused a lot of test failures.

Testing instructions:

Sadly running the whole test suite is problematic at this time, since we
haven't made sure that the integration test suite is runnable.

I'd suggest bootstrapping the environment manually and run:

    zope-testrunner3 -vv --path tests --tests-pattern basic \
        --layer LandscapeLeaderDestroyedLayer

Note that you might have to run that twice due to
https://github.com/juju/amulet/issues/105

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 359
Branch: lp:~bjornt/landscape-charm/reenable-LandscapeLeaderDestroyedLayer
Jenkins: https://ci.lscape.net/job/latch-test/5265/

review: Approve (test results)
Revision history for this message
Chris Glass (tribaal) wrote :

+1!

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 359
Branch: lp:~bjornt/landscape-charm/reenable-LandscapeLeaderDestroyedLayer
Jenkins: https://ci.lscape.net/job/latch-test/5277/

review: Approve (test results)
Revision history for this message
Adam Collard (adam-collard) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches