From patchwork Sat Mar 12 09:33: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: 524 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:43:19 -0000 Delivered-To: patches@linaro.org Received: by 10.224.45.75 with SMTP id d11cs306qaf; Sat, 12 Mar 2011 01:33:36 -0800 (PST) Received: by 10.216.30.80 with SMTP id j58mr381164wea.64.1299922415476; Sat, 12 Mar 2011 01:33:35 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id r57si9934792wes.166.2011.03.12.01.33.33; Sat, 12 Mar 2011 01:33:35 -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 1PyLCX-0007Qf-Iw for ; Sat, 12 Mar 2011 09:33:33 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 8924D2E88BD for ; Sat, 12 Mar 2011 09:33: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: 298 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 298: Merge lp:~lool/linaro-image-tools/igep-support; couple of tests relative to Message-Id: <20110312093333.17295.66644.launchpad@loganberry.canonical.com> Date: Sat, 12 Mar 2011 09:33: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="12568"; Instance="initZopeless config overlay" X-Launchpad-Hash: 818c5e7f60ef02657c053f67906e23b375b942fb Merge authors: Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~lool/linaro-image-tools/igep-support/+merge/52950 proposed by: Loïc Minier (lool) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 298 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Sat 2011-03-12 10:31:11 +0100 message: Merge lp:~lool/linaro-image-tools/igep-support; couple of tests relative to IGEP. modified: 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/tests/test_media_create.py' --- linaro_media_create/tests/test_media_create.py 2011-03-10 23:28:21 +0000 +++ linaro_media_create/tests/test_media_create.py 2011-03-12 09:31:11 +0000 @@ -295,6 +295,14 @@ 'make_boot_script', 'make_boot_ini'] self.assertEqual(expected, self.funcs_calls) + def test_igep_steps(self): + self.mock_set_appropriate_serial_tty(boards.IgepConfig) + self.make_boot_files(boards.IgepConfig) + expected = [ + 'make_uImage', 'make_uInitrd', 'make_boot_script', + 'make_boot_ini'] + self.assertEqual(expected, self.funcs_calls) + def test_overo_steps(self): self.mock_set_appropriate_serial_tty(boards.OveroConfig) self.make_boot_files(boards.OveroConfig) @@ -488,6 +496,25 @@ 'bootm 0x80000000 0x81600000'} self.assertEqual(expected, boot_commands) + def test_igep(self): + # XXX: To fix bug 697824 we have to change class attributes of our + # OMAP board configs, and some tests do that so to make sure they + # don't interfere with us we'll reset that before doing anything. + config = board_configs['igep'] + config.serial_tty = config._serial_tty + boot_cmd = config._get_boot_env( + is_live=False, is_lowmem=False, consoles=[], + rootfs_uuid="deadbeef") + expected = { + 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' + 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc ' + 'nocompcache vram=12M ' + 'omapfb.mode=dvi:1280x720MR-16@60', + 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; ' + 'fatload mmc 0:1 0x81600000 uInitrd; ' + 'bootm 0x80000000 0x81600000'} + self.assertEqual(expected, boot_cmd) + def test_overo(self): # XXX: To fix bug 697824 we have to change class attributes of our # OMAP board configs, and some tests do that so to make sure they