Merge lp:~james-page/charm-helpers/configure_source_proposed into lp:charm-helpers

[James Page]

Add support for 'proposed' as a valid source configuration.

I needed this to enable easy testing of proposed SRU changes.

[Matthew Wedgwood (mew)]

lgtm

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-06-24 03:26:19 +0000
+++ charmhelpers/core/host.py	2013-07-03 11:53:59 +0000
@@ -48,13 +48,13 @@
         log('creating user {0}'.format(username))
         cmd = ['useradd']
         if system_user or password is None:
-           cmd.append('--system')
+            cmd.append('--system')
         else:
-           cmd.extend([
-               '--create-home',
-               '--shell', shell,
-               '--password', password,
-           ])
+            cmd.extend([
+                '--create-home',
+                '--shell', shell,
+                '--password', password,
+            ])
         cmd.append(username)
         subprocess.check_call(cmd)
         user_info = pwd.getpwnam(username)
@@ -261,3 +261,13 @@
                 service('restart', service_name)
         return wrapped_f
     return wrap
+
+
+def lsb_release():
+    '''Return /etc/lsb-release in a dict'''
+    d = {}
+    with open('/etc/lsb-release', 'r') as lsb:
+        for l in lsb:
+            k, v = l.split('=')
+            d[k.strip()] = v.strip()
+    return d
 
=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2013-06-27 15:59:39 +0000
+++ charmhelpers/fetch/__init__.py	2013-07-03 11:53:59 +0000
@@ -3,7 +3,8 @@
 from charmhelpers.core.host import (
     apt_install,
     apt_update,
-    filter_installed_packages
+    filter_installed_packages,
+    lsb_release
 )
 from urlparse import (
     urlparse,
@@ -18,6 +19,9 @@
 CLOUD_ARCHIVE = """# Ubuntu Cloud Archive
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu {} main
 """
+PROPOSED_POCKET = """# Proposed
+deb http://archive.ubuntu.com/ubuntu {}-proposed main universe multiverse restricted
+"""
 
 
 def add_source(source, key=None):
@@ -30,6 +34,10 @@
         pocket = source.split(':')[-1]
         with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
             apt.write(CLOUD_ARCHIVE.format(pocket))
+    elif source == 'proposed':
+        release = lsb_release()['DISTRIB_CODENAME']
+        with open('/etc/apt/sources.list.d/proposed.list', 'w') as apt:
+            apt.write(PROPOSED_POCKET.format(release))
     if key:
         subprocess.check_call(['apt-key', 'import', key])
 
 
=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-06-24 03:26:19 +0000
+++ tests/core/test_host.py	2013-07-03 11:53:59 +0000
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from contextlib import contextmanager
-import os
 import subprocess
+import io
 
 from mock import patch, call, MagicMock
 from testtools import TestCase
@@ -28,6 +28,13 @@
     }
 }
 
+LSB_RELEASE = u'''DISTRIB_ID=Ubuntu
+DISTRIB_RELEASE=13.10
+DISTRIB_CODENAME=saucy
+DISTRIB_DESCRIPTION="Ubuntu Saucy Salamander (development branch)"
+'''
+
+
 def fake_apt_cache():
     def _get(package):
         pkg = MagicMock()
@@ -43,6 +50,7 @@
     cache.__getitem__.side_effect = _get
     return cache
 
+
 @contextmanager
 def patch_open():
     '''Patch open() to allow mocking both open() itself and the file that is
@@ -61,6 +69,18 @@
         yield mock_open, mock_file
 
 
+@contextmanager
+def mock_open(filename, contents=None):
+    ''' Slightly simpler mock of open to return contents for filename '''
+    def mock_file(*args):
+        if args[0] == filename:
+            return io.StringIO(contents)
+        else:
+            return open(*args)
+    with patch('__builtin__.open', mock_file):
+        yield
+
+
 class HelpersTest(TestCase):
     @patch('subprocess.call')
     def test_runs_service_action(self, mock_call):
@@ -120,9 +140,9 @@
         host.service_reload(service_name, restart_on_failure=True)
 
         service.assert_has_calls([
-                            call('reload', service_name),
-                            call('restart', service_name)
-                            ])
+            call('reload', service_name),
+            call('restart', service_name)
+        ])
 
     @patch.object(host, 'service')
     def test_failed_reload_without_restart(self, service):
@@ -711,7 +731,7 @@
     def test_multiservice_restart_on_change_in_order(self, exists, service):
         restart_map = OrderedDict([
             ('/etc/cinder/cinder.conf', ['some-api']),
-            ('/etc/haproxy/haproxy.conf',  ['haproxy'])
+            ('/etc/haproxy/haproxy.conf', ['haproxy'])
         ])
         exists.side_effect = [False, True, True, True]
 
@@ -730,3 +750,17 @@
             call('restart', 'haproxy')
         ]
         self.assertEquals(expected, service.call_args_list)
+
+    def test_lsb_release(self):
+        result = {
+            "DISTRIB_ID": "Ubuntu",
+            "DISTRIB_RELEASE": "13.10",
+            "DISTRIB_CODENAME": "saucy",
+            "DISTRIB_DESCRIPTION": "\"Ubuntu Saucy Salamander "
+                                   "(development branch)\""
+        }
+        with mock_open('/etc/lsb-release', LSB_RELEASE):
+            lsb_release = host.lsb_release()
+            for key in result:
+                print lsb_release
+                self.assertEqual(result[key], lsb_release[key])
 
=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2013-06-27 15:59:39 +0000
+++ tests/fetch/test_fetch.py	2013-07-03 11:53:59 +0000
@@ -55,6 +55,17 @@
             mock_file.write.assert_called_with(result)
         filter_pkg.assert_called_with(['ubuntu-cloud-keyring'])
 
+    @patch.object(fetch, 'lsb_release')
+    def test_add_source_proposed(self, lsb_release):
+        source = "proposed"
+        result = """# Proposed
+deb http://archive.ubuntu.com/ubuntu precise-proposed main universe multiverse restricted
+"""
+        lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'}
+        with patch_open() as (mock_open, mock_file):
+            fetch.add_source(source=source)
+            mock_file.write.assert_called_with(result)
+
     @patch('subprocess.check_call')
     def test_add_source_http_and_key(self, check_call):
         source = "http://archive.ubuntu.com/ubuntu raring-backports main"