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

[Björn Tillenius]

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.

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

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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)

[Chris Glass (tribaal)]

+1!

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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)

[Adam Collard (adam-collard)]

+1

review: Approve

=== modified file 'tests/basic/test_leader.py'
--- tests/basic/test_leader.py	2016-02-02 23:13:43 +0000
+++ tests/basic/test_leader.py	2016-07-01 10:38:34 +0000
@@ -1,9 +1,7 @@
 from helpers import IntegrationTest
 from layers import LandscapeLeaderDestroyedLayer
-import unittest
-
-
[e-mail]("Needs lp:1511659 fixed")
+
+
 class LandscapeLeaderDestroyedTest(IntegrationTest):
     """Test what happens when the landscape-server leader gets destroyed.
 

=== modified file 'tests/layers.py'
--- tests/layers.py	2016-02-02 23:13:43 +0000
+++ tests/layers.py	2016-07-01 10:38:34 +0000
@@ -15,7 +15,7 @@
         cls.environment.setUp()
 
     @classmethod
-    def testTearDown(cls):
+    def tearDown(cls):
         cls.environment.cleanUp()
 
 
@@ -69,6 +69,15 @@
         cls.leader, cls.non_leaders = cls.environment.get_unit_ids(
             "landscape-server")
 
+    @classmethod
+    def tearDown(cls):
+        """Empty teardown.
+
+        This method needs to be here, in order to avoid
+        OneLandscapeUnitLayer.tearDown from being called when
+        TwoLandscapeUnitsLayer gets teared down.
+        """
+
 
 class LandscapeLeaderDestroyedLayer(TwoLandscapeUnitsLayer):
     """Layer for tests meant to run when the leader has been destroyed.
@@ -80,9 +89,6 @@
 
     @classmethod
     def setUp(cls):
-        # XXX: https://bugs.launchpad.net/landscape-charm/+bug/1541128
-        #      https://bugs.launchpad.net/juju-core/+bug/1511659
-        return
         cls.environment.destroy_landscape_leader()
         cls.leader, cls.non_leaders = cls.environment.get_unit_ids(
             "landscape-server")