Merge lp:~freyes/charms/trusty/memcached/lp1636519 into lp:charms/trusty/memcached

[Felipe Reyes]

  Fix bundletester execution

  - Makefile: check if 'charm' package exists, otherwise install it
  - memcached_utils: transform binary to utf-8 (python3 friendly)
  - replication: transform peer_ips() to list
  - 10_deploy_test.py: access the first unit through the list under sentry dict
    instead of assuming /0

=== modified file 'Makefile'
--- Makefile	2015-06-30 14:17:25 +0000
+++ Makefile	2016-11-03 17:42:01 +0000
@@ -10,7 +10,7 @@
 	(which dh_clean && dh_clean) || true
 
 .venv:
-	dpkg -l gcc python-dev python-virtualenv python-apt || sudo apt-get install -y gcc python-dev python-virtualenv python-apt
+	dpkg -l gcc python-dev python-virtualenv python-apt charm || sudo apt-get install -y gcc python-dev python-virtualenv python-apt charm
 	virtualenv .venv --system-site-packages
 	.venv/bin/pip install -I -r test_requirements.txt
 

=== modified file 'hooks/memcached_utils.py'
--- hooks/memcached_utils.py	2015-07-06 21:30:20 +0000
+++ hooks/memcached_utils.py	2016-11-03 17:42:01 +0000
@@ -35,10 +35,10 @@
 
 def dpkg_info_contains(package, key, value):
     info = {}
-    dpkg = subprocess.check_output(
-        ['dpkg', '-s', package]).splitlines()
+    log('dpkg -s %s' % package, level='DEBUG')
+    dpkg = subprocess.check_output(['dpkg', '-s', package]).decode('utf-8')
 
-    for entry in dpkg:
+    for entry in dpkg.splitlines():
         entry = entry.split(':')
         if len(entry) > 1:
             info.update({entry[0].lower(): entry[1]})

=== modified file 'hooks/replication.py'
--- hooks/replication.py	2015-02-18 01:41:18 +0000
+++ hooks/replication.py	2016-11-03 17:42:01 +0000
@@ -41,7 +41,7 @@
             log(msg, level='WARN')
         else:
             try:
-                peer_unit = peer_ips().values()[0]
+                peer_unit = list(peer_ips().values())[0]
 
                 if oldest_peer(peers):
                     master, secondary = (unit_get('private-address'),
@@ -70,7 +70,7 @@
 
 
 def set_repcached_replica():
-    replica = peer_ips().values()[0]
+    replica = list(peer_ips().values())[0]
     log("Setting replica unit: %s" % replica)
 
     master = unit_get('private-address')

=== modified file 'tests/10_deploy_test.py'
--- tests/10_deploy_test.py	2015-12-22 19:37:02 +0000
+++ tests/10_deploy_test.py	2016-11-03 17:42:01 +0000
@@ -140,7 +140,7 @@
 
 # Test if the relation is complete and data was exchanged properly.
 
-memcached_unit = d.sentry.unit['memcached/0']
+memcached_unit = d.sentry['memcached'][0]
 # Get the relation from memcached to mediawiki.
 relation = memcached_unit.relation('cache', 'mediawiki:cache')