Merge lp:~mvo/click/lp1319153-chroot-create into lp:click/devel

[Michael Vogt]

This branch fixes ClickChroot._generate_sources(). Right now it will only generate a valid sources.list if the target arch is on ports.ubuntu.com and the native arch on archive.ubuntu.com.
Note that this is the common case (I'm not even sure we have a supported case that requires something different).

This branch fixes it and adds a test.

[Colin Watson (cjwatson)]

Doesn't this result in duplicate deb-src lines? I think it would be better to accumulate the necessary mirrors and emit deb-src lines at the end, for each pocket.

review: Needs Fixing

[lp:~mvo/click/lp1319153-chroot-create]

426. By Michael Vogt on 2014-05-20

don't duplicate deb-src lines (thanks to Colin)

[Michael Vogt (mvo)]

Thanks Colin! I fixed this in my branch and updated the tests.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-05-19 09:27:58 +0000
+++ click/chroot.py	2014-05-20 06:30:53 +0000
@@ -170,18 +170,20 @@
         for pocket in ['updates', 'security']:
             pockets.append('%s-%s' % (series, pocket))
         sources = []
-        if target_arch not in primary_arches:
-            for pocket in pockets:
-                sources.append("deb [arch=%s] %s %s %s" %
-                               (target_arch, ports_mirror, pocket, components))
-                sources.append("deb-src %s %s %s" %
-                               (ports_mirror, pocket, components))
-        if native_arch in primary_arches:
-            for pocket in pockets:
-                sources.append("deb [arch=%s] %s %s %s" %
-                               (native_arch, self.archive, pocket, components))
-                sources.append("deb-src %s %s %s" %
-                               (self.archive, pocket, components))
+        # write binary lines
+        for arch in (target_arch, native_arch):
+            if arch not in primary_arches:
+                mirror = ports_mirror
+            else:
+                mirror = self.archive
+            for pocket in pockets:
+                sources.append("deb [arch=%s] %s %s %s" %
+                               (arch, mirror, pocket, components))
+        # write source lines
+        for pocket in pockets:
+            sources.append("deb-src %s %s %s" %
+                           (self.archive, pocket, components))
+
         return sources
 
     @property

=== added file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	1970-01-01 00:00:00 +0000
+++ click/tests/test_chroot.py	2014-05-20 06:30:53 +0000
@@ -0,0 +1,85 @@
+# Copyright (C) 2014 Canonical Ltd.
+# Author: Michael Vogt
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Unit tests for click.chroot."""
+
+from __future__ import print_function
+
+__metaclass__ = type
+__all__ = [
+    'TestClickChroot',
+    ]
+
+
+from click.tests.helpers import TestCase
+from click.chroot import (
+    ClickChroot,
+)
+
+
+class TestClickChroot(TestCase):
+    def test_gen_sources_archive_only(self):
+        chroot = ClickChroot("amd64", "ubuntu-sdk-13.10", series="trusty")
+        chroot.native_arch = "i386"
+        sources = chroot._generate_sources(
+            chroot.series, chroot.native_arch, chroot.target_arch,
+            "main")
+        self.assertEqual([
+            'deb [arch=amd64] http://archive.ubuntu.com/ubuntu trusty main',
+            'deb [arch=amd64] http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb [arch=amd64] http://archive.ubuntu.com/ubuntu trusty-security main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-security main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-security main',
+        ], sources)
+
+    def test_gen_sources_mixed_archive_ports(self):
+        chroot = ClickChroot("armhf", "ubuntu-sdk-13.10", series="trusty")
+        chroot.native_arch = "i386"
+        sources = chroot._generate_sources(
+            chroot.series, chroot.native_arch, chroot.target_arch,
+            "main")
+        self.assertEqual([
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty main',
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty-updates main',
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty-security main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb [arch=i386] http://archive.ubuntu.com/ubuntu trusty-security main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-security main',
+        ], sources)
+
+    def test_gen_sources_ports_only(self):
+        chroot = ClickChroot("armhf", "ubuntu-sdk-13.10", series="trusty")
+        chroot.native_arch = "armel"
+        sources = chroot._generate_sources(
+            chroot.series, chroot.native_arch, chroot.target_arch,
+            "main")
+        self.assertEqual([
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty main',
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty-updates main',
+            'deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports trusty-security main',
+            'deb [arch=armel] http://ports.ubuntu.com/ubuntu-ports trusty main',
+            'deb [arch=armel] http://ports.ubuntu.com/ubuntu-ports trusty-updates main',
+            'deb [arch=armel] http://ports.ubuntu.com/ubuntu-ports trusty-security main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-updates main',
+            'deb-src http://archive.ubuntu.com/ubuntu trusty-security main',
+        ], sources)