From patchwork Tue Jan 25 12:04:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 23 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:39:18 -0000 Delivered-To: patches@linaro.org Received: by 10.147.124.10 with SMTP id b10cs52447yan; Tue, 25 Jan 2011 04:04:34 -0800 (PST) Received: by 10.216.187.10 with SMTP id x10mr4616865wem.97.1295957073770; Tue, 25 Jan 2011 04:04:33 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id o62si22409221wee.81.2011.01.25.04.04.33; Tue, 25 Jan 2011 04:04:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PhhdR-0000Jf-2X for ; Tue, 25 Jan 2011 12:04:33 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 0FACF2E8031 for ; Tue, 25 Jan 2011 12:04:33 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 257 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 257: Merge lp:~lool/linaro-image-tools/fix-vexpress-lp-705569. Message-Id: <20110125120433.22528.52775.launchpad@loganberry.canonical.com> Date: Tue, 25 Jan 2011 12:04:33 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12248"; Instance="initZopeless config overlay" X-Launchpad-Hash: 63dd2e00451a10e21c0a90845cb5641c6be7329e Merge authors: Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~lool/linaro-image-tools/fix-vexpress-lp-705569/+merge/47136 proposed by: Loïc Minier (lool) review: Approve - Guilherme Salgado (salgado) review: Needs Information - James Westby (james-w) ------------------------------------------------------------ revno: 257 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Tue 2011-01-25 13:02:38 +0100 message: Merge lp:~lool/linaro-image-tools/fix-vexpress-lp-705569. modified: linaro_media_create/boards.py linaro_media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_media_create/boards.py' --- linaro_media_create/boards.py 2011-01-24 21:08:41 +0000 +++ linaro_media_create/boards.py 2011-01-25 12:02:38 +0000 @@ -221,7 +221,7 @@ @classmethod def _make_boot_files(cls, uboot_parts_dir, boot_cmd, chroot_dir, - boot_dir, boot_script): + boot_dir, boot_script, boot_device_or_file): make_uImage( cls.load_addr, uboot_parts_dir, cls.kernel_suffix, boot_dir) make_uInitrd(uboot_parts_dir, cls.kernel_suffix, boot_dir) === modified file 'linaro_media_create/tests/test_media_create.py' --- linaro_media_create/tests/test_media_create.py 2011-01-24 19:39:45 +0000 +++ linaro_media_create/tests/test_media_create.py 2011-01-25 12:02:38 +0000 @@ -7,6 +7,7 @@ import sys import tempfile import time +import types from testtools import TestCase @@ -20,6 +21,7 @@ rootfs, utils, ) +import linaro_media_create from linaro_media_create.boards import ( board_configs, make_boot_script, @@ -151,6 +153,70 @@ self.assertRaises( AssertionError, _get_mlo_file, tempdir) +class TestBootSteps(TestCaseWithFixtures): + def setUp(self): + super(TestBootSteps, self).setUp() + self.funcs_calls = [] + self.mock_all_boards_funcs() + + def mock_all_boards_funcs(self): + """Mock all functions of linaro_media_create.boards with a call tracer.""" + + def mock_func_creator(name): + return lambda *args, **kwargs: self.funcs_calls.append(name) + + for name in dir(linaro_media_create.boards): + attr = getattr(linaro_media_create.boards, name) + if type(attr) == types.FunctionType: + self.useFixture(MockSomethingFixture( + linaro_media_create.boards, name, mock_func_creator(name))) + + def make_boot_files(self, config): + config.make_boot_files('', False, False, [], '', '', '', '') + + def test_vexpress_steps(self): + config = linaro_media_create.boards.VexpressConfig + self.make_boot_files(config) + expected = ['make_uImage', 'make_uInitrd'] + self.assertEqual(expected, self.funcs_calls) + + def test_mx51evk_steps(self): + config = linaro_media_create.boards.Mx51evkConfig + self.make_boot_files(config) + expected = [ + 'install_mx51evk_boot_loader', 'make_uImage', 'make_uInitrd', + 'make_boot_script'] + self.assertEqual(expected, self.funcs_calls) + + def test_ux500_steps(self): + config = linaro_media_create.boards.Ux500Config + self.make_boot_files(config) + expected = ['make_uImage', 'make_uInitrd', 'make_boot_script'] + self.assertEqual(expected, self.funcs_calls) + + def test_panda_steps(self): + config = linaro_media_create.boards.PandaConfig + self.make_boot_files(config) + expected = [ + 'install_omap_boot_loader', 'make_uImage', 'make_uInitrd', + 'make_boot_script', 'make_boot_ini'] + self.assertEqual(expected, self.funcs_calls) + + def test_beagle_steps(self): + config = linaro_media_create.boards.BeagleConfig + self.make_boot_files(config) + expected = [ + 'install_omap_boot_loader', 'make_uImage', 'make_uInitrd', + 'make_boot_script', 'make_boot_ini'] + self.assertEqual(expected, self.funcs_calls) + + def test_overo_steps(self): + config = linaro_media_create.boards.OveroConfig + self.make_boot_files(config) + expected = [ + 'install_omap_boot_loader', 'make_uImage', 'make_uInitrd', + 'make_boot_script', 'make_boot_ini'] + self.assertEqual(expected, self.funcs_calls) class TestGetBootCmd(TestCase):