From patchwork Mon Jul 29 10:20:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 18622 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 91E602395F for ; Mon, 29 Jul 2013 10:20:37 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ha11sf3459994vcb.4 for ; Mon, 29 Jul 2013 03:20:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=QrDH4wIXCy+2tGRpQaJdjL2URTDmXeIrNmzgeU5yirk=; b=Eny4sVsO0e4bRDt4WV9fH3F41IlOuZzNWaeYuQeILapJFaBbF7RFmaRWq/ZREYu3iY fnpap6WxnjMWaWCm8SwxsO9/3xwlDu1qyoURMHYLyNn1e0twmgLFSYb008D02kPnpLKl 5m4a/Vrl/XP6pdTEybamz0bfLinmSsXbGMOfVzDwXKHQaAvQPjDP4iln+DugvqBLLiZd uPsPXewXgeFIJbZv7l6Nf7xzp5stnhP3gnVQgDKygL0lJ3pcGQmTfZLYdLV8mCUXf2sA XjwD5UGskrYx2+/at77KYfW3ECFogRJ4d65p6gZuNy5F8keg+d7mc5me5E9QOCtZcifU qfKQ== X-Received: by 10.236.88.231 with SMTP id a67mr28023289yhf.39.1375093237265; Mon, 29 Jul 2013 03:20:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.47.110 with SMTP id c14ls1883735qen.71.gmail; Mon, 29 Jul 2013 03:20:37 -0700 (PDT) X-Received: by 10.58.75.41 with SMTP id z9mr26097146vev.4.1375093237018; Mon, 29 Jul 2013 03:20:37 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id dc8si2130772vdc.109.2013.07.29.03.20.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Jul 2013 03:20:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ia10so1904781vcb.20 for ; Mon, 29 Jul 2013 03:20:36 -0700 (PDT) X-Received: by 10.221.47.193 with SMTP id ut1mr8198047vcb.8.1375093236928; Mon, 29 Jul 2013 03:20:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp108382vcb; Mon, 29 Jul 2013 03:20:36 -0700 (PDT) X-Received: by 10.194.108.73 with SMTP id hi9mr31440963wjb.85.1375093235931; Mon, 29 Jul 2013 03:20:35 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id hv7si531519wjb.171.2013.07.29.03.20.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Jul 2013 03:20:35 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1V3kZ9-00055F-BR for ; Mon, 29 Jul 2013 10:20:35 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4807BE076A for ; Mon, 29 Jul 2013 10:20:35 +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: 630 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 630: PEP8 fixes. Message-Id: <20130729102035.22262.21422.launchpad@ackee.canonical.com> Date: Mon, 29 Jul 2013 10:20:35 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16700"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: fd4ab3a6b6ad0d15a8c55ed1190bbcf1fe3d643d X-Gm-Message-State: ALoCoQkT8E7B9Sjpt6VU2fn2XT0fIIuObUl6MMOCUd0NyDckKBCgAf2zjwGC76kfbLltzmdlMkKx X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Milo Casagrande (milo) Related merge proposals: https://code.launchpad.net/~milo/linaro-image-tools/pep8-fixes/+merge/176891 proposed by: Milo Casagrande (milo) ------------------------------------------------------------ revno: 630 [merge] committer: Milo Casagrande branch nick: trunk timestamp: Thu 2013-07-25 10:05:43 +0200 message: PEP8 fixes. modified: linaro_image_tools/hwpack/tests/test_config_v3.py linaro_image_tools/media_create/boards.py 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/hwpack/tests/test_config_v3.py' --- linaro_image_tools/hwpack/tests/test_config_v3.py 2013-02-17 13:53:41 +0000 +++ linaro_image_tools/hwpack/tests/test_config_v3.py 2013-07-25 08:00:25 +0000 @@ -853,7 +853,7 @@ ' - adest.dtb : boot/dt-*-linaro-omap/omap4-panda.dtb\n' + ' - bdest.dtb : ' + 'boot/dt-*-linaro-omap2/omap4-panda2.dtb\n') - expected = [{'adest.dtb':'boot/dt-*-linaro-omap/omap4-panda.dtb'}, + expected = [{'adest.dtb': 'boot/dt-*-linaro-omap/omap4-panda.dtb'}, {'bdest.dtb': 'boot/dt-*-linaro-omap2/omap4-panda2.dtb'}] config = self.get_config(self.valid_complete_v3 + dtb_files) config.validate() === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2013-06-28 13:09:08 +0000 +++ linaro_image_tools/media_create/boards.py 2013-07-25 08:00:25 +0000 @@ -1533,14 +1533,14 @@ seek=self.samsung_env_start) # Populate created raw partition with BL1 and u-boot spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin') - assert os.path.getsize(spl_file) <= ( - self.samsung_bl1_len * SECTOR_SIZE), ( - "%s is larger than Samsung BL1 size" % spl_file) + assert os.path.getsize(spl_file) <= \ + (self.samsung_bl1_len * SECTOR_SIZE), \ + ("%s is larger than Samsung BL1 size" % spl_file) _dd(spl_file, boot_device_or_file, seek=self.samsung_bl1_start) uboot_file = os.path.join(chroot_dir, 'boot', 'u-boot.bin') - assert os.path.getsize(uboot_file) <= ( - self.samsung_bl2_len * SECTOR_SIZE), ( - "%s is larger than Samsung BL2 size" % uboot_file) + assert os.path.getsize(uboot_file) <= \ + (self.samsung_bl2_len * SECTOR_SIZE), \ + ("%s is larger than Samsung BL2 size" % uboot_file) _dd(uboot_file, boot_device_or_file, seek=self.samsung_bl2_start) === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2013-06-27 09:04:20 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2013-07-25 08:00:25 +0000 @@ -848,11 +848,12 @@ ('sudo -E dd if=%s of=boot_device_or_file bs=512 conv=notrunc ' 'seek=1' % bl0_file), ('sudo -E mkimage -A arm -O linux -T kernel -C none -a %s -e %s ' - '-n Linux -d %s %s/uImage' % (board_conf.load_addr, - board_conf.load_addr, k_img_file, self.temp_bootdir_path)), + '-n Linux -d %s %s/uImage' + % (board_conf.load_addr, board_conf.load_addr, + k_img_file, self.temp_bootdir_path)), ('sudo -E mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 ' - '-n initramfs -d %s %s/uInitrd' % ( - i_img_file, self.temp_bootdir_path))] + '-n initramfs -d %s %s/uInitrd' + % (i_img_file, self.temp_bootdir_path))] self.assertEqual(expected_commands, popen_fixture.mock.commands_executed) shutil.rmtree(self.tempdir) @@ -1077,7 +1078,7 @@ expected = [ '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' ' seek=%s' % (sudo_args, toc_filename, - self.snowball_config.SNOWBALL_LOADER_START_S), + self.snowball_config.SNOWBALL_LOADER_START_S), '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path), '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file' @@ -1105,23 +1106,23 @@ expected = [ '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' ' seek=%s' % (sudo_args, toc_filename, - self.snowball_config.SNOWBALL_LOADER_START_S), + self.snowball_config.SNOWBALL_LOADER_START_S), '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path), '%s rm %s/boot_image_issw.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file' ' bs=1 conv=notrunc seek=131588' % (sudo_args, self.temp_bootdir_path), '%s rm %s/boot_image_x-loader.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/mem_init.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=3072' % (sudo_args, self.temp_bootdir_path), '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path), '%s dd if=%s/power_management.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=3200' % (sudo_args, self.temp_bootdir_path), '%s rm %s/power_management.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/u-boot.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=24064' % (sudo_args, self.temp_bootdir_path), '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path), @@ -1142,7 +1143,7 @@ expected = [ '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc' ' seek=%s' % (sudo_args, toc_filename, - board_conf.SNOWBALL_LOADER_START_S), + board_conf.SNOWBALL_LOADER_START_S), '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path), '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file' @@ -1179,8 +1180,8 @@ k_img_file, i_img_file, None) expected = [ '%s mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e' - ' 0x00008000 -n Linux -d %s %s/boot/uImage' % (sudo_args, - k_img_file, self.tempdir), + ' 0x00008000 -n Linux -d %s %s/boot/uImage' + % (sudo_args, k_img_file, self.tempdir), '%s cp /tmp/temp_snowball_make_boot_files %s/boot/boot.txt' % (sudo_args, self.tempdir), '%s mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n boot' @@ -1192,18 +1193,18 @@ '%s dd if=%s/boot/boot_image_issw.bin of=boot_device_or_file' ' bs=512 conv=notrunc seek=257' % (sudo_args, self.tempdir), '%s rm %s/boot_image_issw.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/boot/boot_image_x-loader.bin of=boot_device_or_file' ' bs=1 conv=notrunc seek=131588' % (sudo_args, self.tempdir), '%s rm %s/boot_image_x-loader.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/boot/mem_init.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=3072' % (sudo_args, self.tempdir), '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path), '%s dd if=%s/boot/power_management.bin of=boot_device_or_file' ' bs=512 conv=notrunc seek=3200' % (sudo_args, self.tempdir), '%s rm %s/power_management.bin' % (sudo_args, - self.temp_bootdir_path), + self.temp_bootdir_path), '%s dd if=%s/boot/u-boot.bin of=boot_device_or_file bs=512' ' conv=notrunc seek=24064' % (sudo_args, self.tempdir), '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),