Merge lp:click/devel into lp:click

[Colin Watson]

Click 0.4.42: Fix autopkgtests on non-x86 architectures.

Click 0.4.42: Fix autopkgtests on non-x86 architectures.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'click/chroot.py'
--- click/chroot.py	2015-10-15 11:47:35 +0000
+++ click/chroot.py	2015-12-29 01:24:59 +0000
@@ -481,7 +481,11 @@
             """).format(build_pkgs=' '.join(build_pkgs)))
         return finish_script
 
-    def _debootstrap(self, components, mount, archive):
+    def _debootstrap(self, components, mount, archive_mirror, ports_mirror):
+        if self.native_arch in primary_arches:
+            mirror = archive_mirror
+        else:
+            mirror = ports_mirror
         subprocess.check_call([
             "debootstrap",
             "--arch", self.native_arch,
@@ -489,7 +493,7 @@
             "--components=%s" % ','.join(components),
             self.series,
             mount,
-            archive
+            mirror,
             ])
 
     @property
@@ -560,15 +564,15 @@
         os.makedirs(mount)
 
         country_code = get_geoip_country_code_prefix()
-        archive = "http://%sarchive.ubuntu.com/ubuntu" % country_code
+        archive_mirror = "http://%sarchive.ubuntu.com/ubuntu" % country_code
         ports_mirror = "http://%sports.ubuntu.com/ubuntu-ports" % country_code
         # this doesn't work because we are running this under sudo
         if 'DEBOOTSTRAP_MIRROR' in os.environ:
-            archive = os.environ['DEBOOTSTRAP_MIRROR']
-        self._debootstrap(components, mount, archive)
+            archive_mirror = os.environ['DEBOOTSTRAP_MIRROR']
+        self._debootstrap(components, mount, archive_mirror, ports_mirror)
         sources = generate_sources(self.series, self.native_arch,
                                    self.target_arch,
-                                   archive, ports_mirror,
+                                   archive_mirror, ports_mirror,
                                    ' '.join(components))
         with open("%s/etc/apt/sources.list" % mount, "w") as sources_list:
             for line in sources:

=== modified file 'click/tests/integration/test_build_core_apps.py'
--- click/tests/integration/test_build_core_apps.py	2014-09-04 21:06:46 +0000
+++ click/tests/integration/test_build_core_apps.py	2015-12-29 01:24:59 +0000
@@ -20,6 +20,7 @@
 import os
 import shutil
 import subprocess
+import unittest
 
 from six import with_metaclass
 
@@ -45,6 +46,9 @@
 CORE_APP_MAKE_CMD = [
     "make", "DESTDIR=%s" % CLICK_TARGET_DIR, "install"]
 
+# architectures with native- or cross-compiling support for armhf
+ALLOW_ARCHITECTURES = ["amd64", "arm64", "armhf", "i386"]
+
 
 def find_manifest(start_dir):
     """Find a click manifest.json{,.in} under the given directory"""
@@ -104,21 +108,25 @@
         self.assertEqual(len(glob("*.click")), 1)
 
     def _testbuild_branch(self, branch):
-            # get and parse
-            branch_dir = branch[len("lp:"):]
-            build_dir = os.path.join(branch_dir, "build-tree")
-            if os.path.exists(branch_dir):
-                subprocess.check_call(["bzr", "pull"], cwd=branch_dir)
-            else:
-                subprocess.check_call(["bzr", "branch", branch])
-            manifest = find_manifest(branch_dir)
-            # build it
-            self._set_arch_and_framework_from_manifest(manifest)
-            if os.path.exists(build_dir):
-                shutil.rmtree(build_dir)
-            os.makedirs(build_dir)
-            with chdir(build_dir):
-                self._ensure_click_chroot()
-                self.configure()
-                self.make()
-                self.create_click()
+        system_arch = subprocess.check_output(
+            ["dpkg", "--print-architecture"], universal_newlines=True).strip()
+        if system_arch not in ALLOW_ARCHITECTURES:
+            unittest.skip("%s has no armhf build support" % system_arch)
+        # get and parse
+        branch_dir = branch[len("lp:"):]
+        build_dir = os.path.join(branch_dir, "build-tree")
+        if os.path.exists(branch_dir):
+            subprocess.check_call(["bzr", "pull"], cwd=branch_dir)
+        else:
+            subprocess.check_call(["bzr", "branch", branch])
+        manifest = find_manifest(branch_dir)
+        # build it
+        self._set_arch_and_framework_from_manifest(manifest)
+        if os.path.exists(build_dir):
+            shutil.rmtree(build_dir)
+        os.makedirs(build_dir)
+        with chdir(build_dir):
+            self._ensure_click_chroot()
+            self.configure()
+            self.make()
+            self.create_click()

=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2015-10-06 19:33:35 +0000
+++ click/tests/test_chroot.py	2015-12-29 01:24:59 +0000
@@ -49,7 +49,7 @@
         self._maint_kwargs = kwargs
         return 0
 
-    def _debootstrap(self, components, mount, archive_server):
+    def _debootstrap(self, components, mount, archive_mirror, ports_mirror):
         os.makedirs(os.path.join(mount, "etc", "apt"))
         os.makedirs(os.path.join(mount, "usr", "sbin"))
         os.makedirs(os.path.join(mount, "sbin"))

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-11 01:31:29 +0000
+++ debian/changelog	2015-12-29 01:24:59 +0000
@@ -1,3 +1,12 @@
+click (0.4.42) UNRELEASED; urgency=medium
+
+  * chroot: Point debootstrap at ports.ubuntu.com for non-primary
+    architectures.
+  * Skip build_core_apps integration tests on architectures that lack
+    support for native- or cross-compiling for armhf.
+
+ -- Colin Watson <[e-mail]>  Tue, 29 Dec 2015 01:05:36 +0000
+
 click (0.4.41+16.04.20151211-0ubuntu1) xenial; urgency=medium
 
   [ Colin Watson ]