Merge lp:~tvansteenburgh/charms/precise/cakephp/fix-test-deps into lp:charms/cakephp

[Tim Van Steenburgh]

Fix test deps

[Matt Bruzek (mbruzek)]

+1 LGTM Thanks for taking a look at this Tim!

review: Approve

=== modified file 'hooks/common.sh'
--- hooks/common.sh	2014-08-15 09:01:00 +0000
+++ hooks/common.sh	2014-12-08 15:14:04 +0000
@@ -6,7 +6,7 @@
 install_deps(){
     juju-log "Installing packages"
     apt-get update
-    apt-get install -y apache2 php5-cgi php5-mysql curl php5-gd wget libapache2-mod-php5 mysql-client
+    apt-get install -y apache2 php5-cgi php5-mysql curl php5-gd wget libapache2-mod-php5 mysql-client git
 }
 
 #

=== modified file 'tests/00-setup.sh'
--- tests/00-setup.sh	2014-05-18 08:55:52 +0000
+++ tests/00-setup.sh	2014-12-08 15:14:04 +0000
@@ -4,5 +4,4 @@
 
 sudo add-apt-repository -y ppa:juju/stable
 sudo apt-get update
-sudo apt-get -y install amulet
-sudo pip install --upgrade requests
+sudo apt-get -y install python3-amulet python3-requests

=== modified file 'tests/helper.py'
--- tests/helper.py	2014-06-17 18:08:21 +0000
+++ tests/helper.py	2014-12-08 15:14:04 +0000
@@ -3,14 +3,15 @@
 import amulet
 import requests
 
+
 class BaseTest(object):
-    def __init__(self, options={}):
+    def __init__(self, options=None):
         self.deploy = amulet.Deployment()
-    
+
         self.deploy.add('mysql')
         self.deploy.add('cakephp')
 
-        if (options != {}):
+        if options:
             self.deploy.configure('cakephp', options)
 
         self.deploy.relate('mysql:db', 'cakephp:database')
@@ -24,7 +25,7 @@
             amulet.raise_status(amulet.FAIL, msg='Environment did not set up in %d seconds' % seconds)
 
         self.cakephp_unit = self.deploy.sentry.unit['cakephp/0']
-        
+
         host = self.cakephp_unit.info['public-address']
         port = self.cakephp_unit.info['open-ports'][0].split('/')[0]
         self.base_url = 'http://{}:{}'.format(host, port)