Merge lp:~james-page/charm-helpers/fix-ca-sources into lp:charm-helpers

[James Page]

Fixup broken source templates for UCA and proposed pockets.

[lp:~james-page/charm-helpers/fix-ca-sources]

629. By James Page on 2016-09-16

Fixup associated unit tests

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'charmhelpers/fetch/ubuntu.py'
--- charmhelpers/fetch/ubuntu.py	2016-08-10 09:57:19 +0000
+++ charmhelpers/fetch/ubuntu.py	2016-09-16 13:33:11 +0000
@@ -24,11 +24,14 @@
 from charmhelpers.core.hookenv import log
 from charmhelpers.fetch import SourceConfigError
 
-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')
+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
+"""
+
 CLOUD_ARCHIVE_POCKETS = {
     # Folsom
     'folsom': 'precise-updates/folsom',

=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2016-08-12 07:09:27 +0000
+++ tests/fetch/test_fetch.py	2016-09-16 13:33:11 +0000
@@ -286,9 +286,9 @@
         imp.reload(fetch)
 
         source = "cloud:precise-updates/havana"
-        result = ('# Ubuntu Cloud Archive'
-                  ' deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
-                  ' precise-updates/havana main')
+        result = ('# Ubuntu Cloud Archive\n'
+                  'deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
+                  ' precise-updates/havana main\n')
 
         with patch_open() as (mock_open, mock_file):
             fetch.add_source(source=source)
@@ -305,9 +305,9 @@
         imp.reload(fetch)
 
         source = "cloud:precise-havana"
-        result = ('# Ubuntu Cloud Archive'
-                  ' deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
-                  ' precise-updates/havana main')
+        result = ('# Ubuntu Cloud Archive\n'
+                  'deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
+                  ' precise-updates/havana main\n')
         with patch_open() as (mock_open, mock_file):
             fetch.add_source(source=source)
             mock_file.write.assert_called_with(result)
@@ -323,9 +323,9 @@
         imp.reload(fetch)
 
         source = "cloud:havana"
-        result = ('# Ubuntu Cloud Archive'
-                  ' deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
-                  ' precise-updates/havana main')
+        result = ('# Ubuntu Cloud Archive\n'
+                  'deb http://ubuntu-cloud.archive.canonical.com/ubuntu'
+                  ' precise-updates/havana main\n')
         with patch_open() as (mock_open, mock_file):
             fetch.add_source(source=source)
             mock_file.write.assert_called_with(result)
@@ -339,9 +339,9 @@
         imp.reload(fetch)
 
         source = "proposed"
-        result = ('# Proposed'
-                  ' deb http://archive.ubuntu.com/ubuntu precise-proposed'
-                  ' main universe multiverse restricted')
+        result = ('# Proposed\n'
+                  'deb http://archive.ubuntu.com/ubuntu precise-proposed'
+                  ' main universe multiverse restricted\n')
         lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'}
         with patch_open() as (mock_open, mock_file):
             fetch.add_source(source=source)