Merge lp:~stub/charms/trusty/cassandra/spike into lp:charms/trusty/cassandra

[Stuart Bishop]

Update the integration tests to work with Juju 1.25.

With Juju 1.25, unit names will be unique in the environment and unit names from a previously deployed service with the same name will not be reused. This means we can no longer assume that 'cassandra/0' will exist.

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1437/

review: Needs Fixing (automated testing)

[lp:~stub/charms/trusty/cassandra/spike]

367. By Stuart Bishop on 2015-11-13

Fix a better hidden failure from Juju 1.25 unit numbering changes

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1424/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1561/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1543/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1544/

review: Approve (automated testing)

[Charles Butler (lazypower)]

+1 LGTM.

Thanks stub!

review: Approve

=== modified file 'tests/test_integration.py'
--- tests/test_integration.py	2015-08-19 09:57:40 +0000
+++ tests/test_integration.py	2015-11-13 05:38:23 +0000
@@ -187,7 +187,7 @@
 
     def get_client_relinfo(self, relname):
         # We only need one unit, even if rf > 1
-        s = self.deployment.sentry['cassandra/0']
+        s = self.deployment.sentry['cassandra'][0]
         relinfo = s.relation(relname, 'client:{}'.format(relname))
         return relinfo
 
@@ -287,11 +287,11 @@
         # and data migrated. Instead, keep checking until our condition
         # is met, or a timeout reached.
         timeout = time.time() + 300
-        for unit_num in range(0, self.rf):
-            unit = 'cassandra/{}'.format(unit_num)
+        for s in self.deployment.sentry['cassandra']:
+            unit = s.info['unit_name']
+            unit_num = s.info['unit']
             with self.subTest(unit=unit):
                 while True:
-                    s = self.deployment.sentry[unit]
                     # Attempting to diagnose Amulet failures. I suspect
                     # SSH host keys again, per Bug #802117
                     try:
@@ -354,7 +354,8 @@
                 self.assertIsInstance(fail, AuthenticationFailed)
 
     def test_cqlsh(self):
-        subprocess.check_output(['juju', 'ssh', 'cassandra/0',
+        unit = self.deployment.sentry['cassandra'][0].info['unit_name']
+        subprocess.check_output(['juju', 'ssh', unit,
                                  'sudo -H cqlsh -e exit'],
                                 stderr=subprocess.STDOUT)