From patchwork Tue Jan 25 13:46: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: 27 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:19 -0000 Delivered-To: patches@linaro.org Received: by 10.147.124.10 with SMTP id b10cs55474yan; Tue, 25 Jan 2011 05:46:34 -0800 (PST) Received: by 10.227.177.10 with SMTP id bg10mr5866719wbb.148.1295963194113; Tue, 25 Jan 2011 05:46:34 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id z57si22605454weq.183.2011.01.25.05.46.33; Tue, 25 Jan 2011 05:46:34 -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 1PhjE9-0008Sn-9k for ; Tue, 25 Jan 2011 13:46:33 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 47E252E8EC4 for ; Tue, 25 Jan 2011 13:46: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: 259 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 259: TestGetBootCmd.test_overo(): update for new OveroConfig console settings; Message-Id: <20110125134633.25546.19917.launchpad@loganberry.canonical.com> Date: Tue, 25 Jan 2011 13:46: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: c1d3f6b92a7fe4968cf4482d98abe94bd884954f ------------------------------------------------------------ revno: 259 committer: Loïc Minier branch nick: linaro-image-tools timestamp: Tue 2011-01-25 14:44:16 +0100 message: TestGetBootCmd.test_overo(): update for new OveroConfig console settings; fixes testsuite. 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-01-25 12:02:38 +0000 +++ linaro_media_create/tests/test_media_create.py 2011-01-25 13:44:16 +0000 @@ -284,8 +284,8 @@ expected = ( "setenv bootcmd 'fatload mmc 0:1 0x80000000 uImage; " "fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 " - "0x81600000'\nsetenv bootargs ' " - "console=ttyS2,115200n8 root=UUID=%s rootwait ro earlyprintk'" + "0x81600000'\nsetenv bootargs ' console=tty0 " + "console=ttyO2,115200n8 root=UUID=%s rootwait ro earlyprintk'" "\nboot" % ROOTFS_UUID) self.assertEqual(expected, boot_cmd)