Merge lp:~lazypower/charms/trusty/elasticsearch/fix-tests-unit-identifier into lp:charms/trusty/elasticsearch

[Charles Butler]

Fixes for: http://reports.vapour.ws/all-bundle-and-charm-results/charm-bundle-test-parent-6400/charm/aws/12

[Charles Butler (lazypower)]

superceded by other merges

Unmerged revisions

43. By Charles Butler on 2016-03-29

Corrects a stale unit pointer issue with the tests

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-10-27 22:30:30 +0000
+++ hooks/hooks.py	2016-03-29 17:37:24 +0000
@@ -88,7 +88,7 @@
                            'to: {}'.format(new_path))
     os.chmod(new_path, 0700)
     charmhelpers.core.host.service_stop('elasticsearch')
-    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes  # noqa
         os.path.join(new_path, ''),
         options=['--archive'])
     shutil.rmtree(old_path)

=== modified file 'tests/helpers/__init__.py'
--- tests/helpers/__init__.py	2014-10-30 01:02:33 +0000
+++ tests/helpers/__init__.py	2016-03-29 17:37:24 +0000
@@ -17,9 +17,9 @@
 
 
 def curl_on_unit(curl_command, deployment, unit_number=0):
-    unit = "elasticsearch/{}".format(unit_number)
+    unit = "elasticsearch"
 
-    response = deployment.sentry.unit[unit].run(curl_command)
+    response = deployment.sentry.unit[unit][unit_number].run(curl_command)
     if response[1] != 0:
         msg = (
             "Elastic search didn't respond to the command \n"