Merge lp:~cjwatson/click/native-dpkg-architecture into lp:click

[Colin Watson]

Fix DEB_BUILD_* environment variables when building on amd64 for i386 (LP: #1328486).

When we're building on amd64 for i386 using "click chroot run", we override the native architecture to i386, but at the moment we don't fix up DEB_BUILD_* to match. That causes various problems such as cmake trying to use the wrong path to moc.

It doesn't appear to be possible to tell dpkg-architecture to use a different build architecture, short of supplying a mock "dpkg --print-architecture", which seems rather fragile. However, since we read its output and export it ourselves anyway, and we only need to worry about the case where the build and host architectures are being forced to be equal, we can just substitute DEB_HOST_* as DEB_BUILD_*.

[lp:~cjwatson/click/native-dpkg-architecture]

458. By Colin Watson on 2014-06-10

Mock "dpkg --print-architecture" so that we can select different native architectures in tests.

Unmerged revisions

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-05-22 09:56:13 +0000
+++ click/chroot.py	2014-06-10 17:04:03 +0000
@@ -212,6 +212,14 @@
             except ValueError:
                 continue
             dpkg_architecture[key] = value
+        if self.native_arch == self.target_arch:
+            # We may have overridden the native architecture (see
+            # _get_native_arch above), so we need to force DEB_BUILD_* to
+            # match.
+            for key in list(dpkg_architecture):
+                if key.startswith("DEB_HOST_"):
+                    new_key = "DEB_BUILD_" + key[len("DEB_HOST_"):]
+                    dpkg_architecture[new_key] = dpkg_architecture[key]
         return dpkg_architecture
 
     def _generate_sources(self, series, native_arch, target_arch, components):

=== modified file 'click/tests/test_chroot.py'
--- click/tests/test_chroot.py	2014-05-20 11:52:16 +0000
+++ click/tests/test_chroot.py	2014-06-10 17:04:03 +0000
@@ -23,6 +23,8 @@
     ]
 
 
+import subprocess
+
 from click.tests.helpers import TestCase
 from click.chroot import (
     ClickChroot,
@@ -42,6 +44,28 @@
         chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
         self.assertEqual("i386", chroot._get_native_arch("amd64", "i386"))
 
+    def test_dpkg_architecture_to_armhf(self):
+        chroot = ClickChroot("armhf", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("armhf", chroot.dpkg_architecture["DEB_HOST_ARCH"])
+        system_arch = subprocess.check_output(
+            ["dpkg", "--print-architecture"],
+            universal_newlines=True).strip()
+        self.assertEqual(
+            system_arch, chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+
+    def test_dpkg_architecture_to_i386(self):
+        chroot = ClickChroot("i386", "ubuntu-sdk-14.04", series="trusty")
+        self.assertEqual("i386", chroot.dpkg_architecture["DEB_HOST_ARCH"])
+        system_arch = subprocess.check_output(
+            ["dpkg", "--print-architecture"],
+            universal_newlines=True).strip()
+        if system_arch == "amd64":
+            self.assertEqual(
+                "i386", chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+        else:
+            self.assertEqual(
+                system_arch, chroot.dpkg_architecture["DEB_BUILD_ARCH"])
+
     def test_gen_sources_archive_only(self):
         chroot = ClickChroot("amd64", "ubuntu-sdk-13.10", series="trusty")
         chroot.native_arch = "i386"

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-05 18:18:51 +0000
+++ debian/changelog	2014-06-10 17:04:03 +0000
@@ -1,3 +1,14 @@
+click (0.4.26) UNRELEASED; urgency=medium
+
+  [ Michael Vogt ]
+  * Add basic integration tests, run via autopkgtest.
+
+  [ Colin Watson ]
+  * Fix DEB_BUILD_* environment variables when building on amd64 for i386
+    (LP: #1328486).
+
+ -- Colin Watson <[e-mail]>  Mon, 09 Jun 2014 11:02:39 +0100
+
 click (0.4.25) utopic; urgency=medium
 
   [ Ted Gould ]

=== modified file 'debian/control'
--- debian/control	2014-06-01 12:45:10 +0000
+++ debian/control	2014-06-10 17:04:03 +0000
@@ -9,6 +9,7 @@
 X-Auto-Uploader: no-rewrite-version
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
+XS-Testsuite: autopkgtest
 
 Package: click
 Architecture: any

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-06-10 17:04:03 +0000
@@ -0,0 +1,3 @@
+Tests: run-tests.sh
+Depends: @, iputils-ping, click-dev, schroot, debootstrap
+Restrictions: needs-root allow-stderr
\ No newline at end of file

=== added file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	1970-01-01 00:00:00 +0000
+++ debian/tests/run-tests.sh	2014-06-10 17:04:03 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+python -m unittest discover tests.integration
+#python3 -m unittest discover tests.integration

=== added directory 'tests'
=== added file 'tests/__init__.py'
=== added directory 'tests/integration'
=== added file 'tests/integration/__init__.py'
=== added file 'tests/integration/test_integration.py'
--- tests/integration/test_integration.py	1970-01-01 00:00:00 +0000
+++ tests/integration/test_integration.py	2014-06-10 17:04:03 +0000
@@ -0,0 +1,161 @@
+# Copyright (C) 2014 Canonical Ltd.
+# Author: Michael Vogt <[e-mail]>
+
+# 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/>.
+
+"""Integration tests for the click CLI interface."""
+
+import copy
+import contextlib
+import glob
+import json
+import os
+import os.path
+import random
+import re
+import shutil
+import string
+import subprocess
+import sys
+import tempfile
+import unittest
+
+
[e-mail]
+def chdir(target):
+    curdir = os.getcwd()
+    os.chdir(target)
+    yield
+    os.chdir(curdir)
+
+
+class TestCase(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.click_binary = os.path.abspath(
+            os.path.join(sys.argv[0], "..", "bin", "click"))
+
+    def setUp(self):
+        self.saved_env = copy.copy(os.environ)
+        os.environ["PYTHONPATH"] = os.path.abspath(
+            os.path.join(sys.argv[0], ".."))
+
+    def tearDown(self):
+        os.environ = self.saved_env
+
+    def _make_click(self, name=None, version=1.0):
+        if name is None:
+            name = "com.ubuntu.%s" % "".join(random.choice(string.lowercase) 
+                                             for i in range(10))
+        tmpdir = tempfile.mkdtemp()
+        self.addCleanup(lambda: shutil.rmtree(tmpdir))
+        clickdir = os.path.join(tmpdir, name)
+        os.makedirs(clickdir)
+        with open(os.path.join(clickdir, "manifest.json"), "w") as f:
+            f.write("""{
+            "name": "%s",
+            "version": "%s",
+            "maintainer": "Foo Bar <[e-mail]>",
+            "title": "test title",
+            "framework": "ubuntu-sdk-13.10"
+            }""" % (name, version))
+        with open(os.path.join(clickdir, "README"), "w") as f:
+            f.write("hello world!")
+        with chdir(tmpdir), open(os.devnull, "w") as devnull:
+            subprocess.call(["click", "build", clickdir], stdout=devnull)
+        generated_clicks = glob.glob(os.path.join(tmpdir, "*.click"))
+        self.assertEqual(len(generated_clicks), 1)
+        return generated_clicks[0]
+
+
+class TestBuild(TestCase):
+    def test_build(self):
+        path_to_click = self._make_click()
+        self.assertTrue(os.path.exists(path_to_click))
+
+
+class TestInfo(TestCase):
+    def test_info(self):
+        name = "com.ubuntu.foo"
+        path_to_click = self._make_click(name)
+        output = subprocess.check_output([
+            self.click_binary, "info", path_to_click])
+        self.assertEqual(json.loads(output)["name"], name)
+
+
+class TestVerify(TestCase):
+    def test_verify_ok(self):
+        name = "com.ubuntu.verify-ok"
+        path_to_click = self._make_click(name)
+        output = subprocess.check_output([
+            self.click_binary, "verify", "--force-missing-framework",
+            path_to_click])
+        self.assertEqual(output, "")
+
+
+class TestContents(TestCase):
+    def test_contents(self):
+        name = "com.ubuntu.contents"
+        path_to_click = self._make_click(name)
+        output = subprocess.check_output([
+            self.click_binary, "contents", path_to_click])
+        self.assertTrue(re.search(
+            r'-rw-r[-w]-r-- root/root\s+[0-9]+\s+[0-9-]+ [0-9:]+ ./README', output))
+
+
[e-mail](
+    os.getuid() != 0, "This tests needs to run as root")
[e-mail](
+    subprocess.call(["ping", "-c1", "archive.ubuntu.com"]) != 0, "Need network")
+class TestChroot(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestChroot, cls).setUpClass()
+        cls.arch = subprocess.check_output(
+            ["dpkg", "--print-architecture"]).strip()
+        subprocess.check_call([
+            cls.click_binary, 
+            "chroot", "-a", cls.arch,
+            "create"])
+
+    @classmethod
+    def tearDownClass(cls):
+        subprocess.check_call([
+            cls.click_binary,
+            "chroot", "-a", cls.arch,
+            "destroy"])
+
+    def test_upgrade(self):
+        subprocess.check_call([
+            self.click_binary, "chroot", "-a", self.arch,
+            "upgrade"])
+
+    def test_install(self):
+        subprocess.check_call([
+            self.click_binary, "chroot", "-a", self.arch,
+            "install", "apt-utils"])
+    
+    def test_run(self):
+        output = subprocess.check_output([
+            self.click_binary, "chroot", "-a", self.arch,
+            "run", "echo", "hello world"])
+        self.assertEqual(output, "hello world\n")
+
+    def test_maint(self):
+        output = subprocess.check_output([
+            self.click_binary, "chroot", "-a", self.arch,
+            "maint", "id"])
+        self.assertEqual(output, "uid=0(root) gid=0(root) groups=0(root)\n")
+