From patchwork Fri Apr 20 13:11:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tunnicliffe X-Patchwork-Id: 7974 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5AFD423E49 for ; Fri, 20 Apr 2012 13:11:19 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 01D60A18580 for ; Fri, 20 Apr 2012 13:11:18 +0000 (UTC) Received: by iage36 with SMTP id e36so18288369iag.11 for ; Fri, 20 Apr 2012 06:11:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=QZH1oPhy3au/0xU8yGxar7scss5++m4SVA74VOFpupE=; b=OiL9L1wDz8lX1sw+qpo5kC4CuqhzD2kQ7RgRz7lxeKauRAsT7Q3arg5h1BuYNZIA3W YUBNk8KTv4ozYI1nvRjJANgHWYpWlROu0HLUZk/4O3rXtBphNvlTWfVsB8Vlc6U7USGM foL6jeKfZmFUY9X14BohHQN+rMDTNNvSdchLJYQ5n9YX5qriL24qcLiF1jqAatrZPKft 9yKAxnTkf/n4PRAi3NFNAdYyvLDPVZoUzSXvDTo0qDoDZIGkrtH1N0ljbf4eOM0JlBpa +++n//a0GkEwaXyf3/7avAucZxXK5Lt++p/7XaoWYmbIKYWjjab9g1pPyIbVm27O+e7i THXQ== Received: by 10.43.49.201 with SMTP id vb9mr4962258icb.35.1334927474021; Fri, 20 Apr 2012 06:11:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.137.198 with SMTP id x6csp32054ibt; Fri, 20 Apr 2012 06:11:13 -0700 (PDT) Received: by 10.180.95.37 with SMTP id dh5mr8036993wib.8.1334927471742; Fri, 20 Apr 2012 06:11:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id bu7si2647011wib.9.2012.04.20.06.11.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Apr 2012 06:11:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SLDcF-0000fB-2R for ; Fri, 20 Apr 2012 13:11:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 013E4E03EE for ; Fri, 20 Apr 2012 13:11:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 511 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 511: Fixed failing tests due to last merge Message-Id: <20120420131111.868.79709.launchpad@ackee.canonical.com> Date: Fri, 20 Apr 2012 13:11:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15120"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c51768bfb210185110b5d7ed0effac652d64f1f3 X-Gm-Message-State: ALoCoQmM+acXBJ7Zul7PFY9eb9QEqKpZ43pQFfq7d5pzND5GhOiE6XpsJYA/CiCPZNHe4Wtj33uK ------------------------------------------------------------ revno: 511 committer: James Tunnicliffe branch nick: trunk timestamp: Fri 2012-04-20 14:09:03 +0100 message: Fixed failing tests due to last merge modified: linaro_image_tools/media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/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-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-04-19 01:12:10 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-04-20 13:09:03 +0000 @@ -2828,7 +2828,8 @@ def fake_append_to_fstab(disk, additions): self.lines_added_to_fstab = additions - def fake_create_flash_kernel_config(disk, partition_offset): + def fake_create_flash_kernel_config(disk, mmc_device_id, + partition_offset): self.create_flash_kernel_config_called = True # Mock stdout, cmd_runner.Popen(), append_to_fstab and @@ -2861,7 +2862,7 @@ populate_rootfs( contents_dir, root_disk, partition='/dev/rootfs', rootfs_type='ext3', rootfs_uuid='uuid', should_create_swap=True, - swap_size=100, partition_offset=0) + swap_size=100, mmc_device_id=0, partition_offset=0) self.assertEqual( ['UUID=uuid / ext3 errors=remount-ro 0 1', @@ -2884,7 +2885,8 @@ fixture = self.useFixture(MockCmdRunnerPopenFixture()) tempdir = self.useFixture(CreateTempDirFixture()).tempdir - create_flash_kernel_config(tempdir, boot_partition_number=1) + create_flash_kernel_config(tempdir, mmc_device_id=0, + boot_partition_number=1) calls = fixture.mock.calls self.assertEqual(1, len(calls), calls) @@ -2897,7 +2899,8 @@ '%s mv -f %s %s/etc/flash-kernel.conf' % ( sudo_args, tmpfile, tempdir), fixture.mock.commands_executed[0]) - self.assertEqual('UBOOT_PART=/dev/mmcblk0p1', open(tmpfile).read()) + self.assertEqual('UBOOT_PART=/dev/mmcblk0p1', + open(tmpfile).read().rstrip()) def test_list_files(self): tempdir = self.useFixture(CreateTempDirFixture()).tempdir