Merge lp:~registry/charms/precise/apache2/apache-apt-update into lp:charms/apache2

[Chris Johnston]

Run apt-get update prior to apt-get install

The charm isn't running apt-get update prior to installing packages, so sometimes apt-get install fails.

[Celso Providelo (cprov)]

review: Approve

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-02-08 15:03:11 +0000
+++ hooks/hooks.py	2014-06-11 17:25:08 +0000
@@ -21,6 +21,7 @@
     unit_get
 )
 from charmhelpers.contrib.charmsupport import nrpe
+from charmhelpers.fetch import apt_update
 
 ###############################################################################
 # Global variables
@@ -196,6 +197,7 @@
 def install_hook():
     if not os.path.exists(default_apache2_service_config_dir):
         os.mkdir(default_apache2_service_config_dir, 0600)
+    apt_update(fatal=True)
     apt_get_install("python-jinja2")
     install_status = apt_get_install("apache2")
     if install_status == 0:
 
=== modified file 'hooks/tests/test_balancer_hook.py'
--- hooks/tests/test_balancer_hook.py	2014-01-16 12:33:28 +0000
+++ hooks/tests/test_balancer_hook.py	2014-06-11 17:25:08 +0000
@@ -502,7 +502,9 @@
     @patch('os.mkdir')
     @patch('hooks.apt_get_install')
     @patch('hooks.log', MagicMock())
-    def test_installs_hook(self, apt_get_install, mkdir, exists, config_get):
+    @patch('hooks.apt_update')
+    def test_installs_hook(
+            self, apt_update, apt_get_install, mkdir, exists, config_get):
         exists.return_value = self.not_a_dir
         config_get.return_value = None
         apt_get_install.return_value = 'some result'
@@ -523,8 +525,9 @@
     @patch('os.mkdir')
     @patch('hooks.apt_get_install')
     @patch('hooks.log', MagicMock())
+    @patch('hooks.apt_update')
     def test_install_hook_installs_extra_packages(
-            self, apt_get_install, mkdir, exists, config_get):
+            self, apt_update, apt_get_install, mkdir, exists, config_get):
         exists.return_value = self.dir_exists
         config_get.return_value = "extra"
         apt_get_install.return_value = 'some result'
@@ -543,8 +546,9 @@
     @patch('os.mkdir')
     @patch('hooks.apt_get_install')
     @patch('hooks.log', MagicMock())
+    @patch('hooks.apt_update')
     def test_doesnt_create_dir_to_install_hooks_if_not_needed(
-            self, apt_get_install, mkdir, exists, config_get):
+            self, apt_update, apt_get_install, mkdir, exists, config_get):
         exists.return_value = self.dir_exists
         config_get.return_value = None
         apt_get_install.return_value = 'some result'