Linaro Image Tools

Merge lp:~milo/linaro-image-tools/pep8-fixes into lp:linaro-image-tools/11.11

  1. pep8-fixes
  2. Merge into trunk
Proposed by Milo Casagrande
Status: Merged
Approved by: Fathi Boudra
Approved revision: 630
Merged at revision: 630
Proposed branch: lp:~milo/linaro-image-tools/pep8-fixes
Merge into: lp:linaro-image-tools/11.11
Diff against target: 137 lines (+23/-22)
3 files modified
linaro_image_tools/hwpack/tests/test_config_v3.py (+1/-1)
linaro_image_tools/media_create/boards.py (+6/-6)
linaro_image_tools/media_create/tests/test_media_create.py (+16/-15)
To merge this branch: bzr merge lp:~milo/linaro-image-tools/pep8-fixes
Reviewer Review Type Date Requested Status
Fathi Boudra Pending
Review via email: mp+176891@code.launchpad.net

Description of the change

Another bunch of PEP8 fixes to make tests pass.
Also necessary to release l-i-t.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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:02:32 +0000
@@ -853,7 +853,7 @@
853 ' - adest.dtb : boot/dt-*-linaro-omap/omap4-panda.dtb\n' +853 ' - adest.dtb : boot/dt-*-linaro-omap/omap4-panda.dtb\n' +
854 ' - bdest.dtb : ' +854 ' - bdest.dtb : ' +
855 'boot/dt-*-linaro-omap2/omap4-panda2.dtb\n')855 'boot/dt-*-linaro-omap2/omap4-panda2.dtb\n')
856 expected = [{'adest.dtb':'boot/dt-*-linaro-omap/omap4-panda.dtb'},856 expected = [{'adest.dtb': 'boot/dt-*-linaro-omap/omap4-panda.dtb'},
857 {'bdest.dtb': 'boot/dt-*-linaro-omap2/omap4-panda2.dtb'}]857 {'bdest.dtb': 'boot/dt-*-linaro-omap2/omap4-panda2.dtb'}]
858 config = self.get_config(self.valid_complete_v3 + dtb_files)858 config = self.get_config(self.valid_complete_v3 + dtb_files)
859 config.validate()859 config.validate()
860860
=== 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:02:32 +0000
@@ -1533,14 +1533,14 @@
1533 seek=self.samsung_env_start)1533 seek=self.samsung_env_start)
1534 # Populate created raw partition with BL1 and u-boot1534 # Populate created raw partition with BL1 and u-boot
1535 spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')1535 spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')
1536 assert os.path.getsize(spl_file) <= (1536 assert os.path.getsize(spl_file) <= \
1537 self.samsung_bl1_len * SECTOR_SIZE), (1537 (self.samsung_bl1_len * SECTOR_SIZE), \
1538 "%s is larger than Samsung BL1 size" % spl_file)1538 ("%s is larger than Samsung BL1 size" % spl_file)
1539 _dd(spl_file, boot_device_or_file, seek=self.samsung_bl1_start)1539 _dd(spl_file, boot_device_or_file, seek=self.samsung_bl1_start)
1540 uboot_file = os.path.join(chroot_dir, 'boot', 'u-boot.bin')1540 uboot_file = os.path.join(chroot_dir, 'boot', 'u-boot.bin')
1541 assert os.path.getsize(uboot_file) <= (1541 assert os.path.getsize(uboot_file) <= \
1542 self.samsung_bl2_len * SECTOR_SIZE), (1542 (self.samsung_bl2_len * SECTOR_SIZE), \
1543 "%s is larger than Samsung BL2 size" % uboot_file)1543 ("%s is larger than Samsung BL2 size" % uboot_file)
1544 _dd(uboot_file, boot_device_or_file, seek=self.samsung_bl2_start)1544 _dd(uboot_file, boot_device_or_file, seek=self.samsung_bl2_start)
15451545
15461546
15471547
=== 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:02:32 +0000
@@ -848,11 +848,12 @@
848 ('sudo -E dd if=%s of=boot_device_or_file bs=512 conv=notrunc '848 ('sudo -E dd if=%s of=boot_device_or_file bs=512 conv=notrunc '
849 'seek=1' % bl0_file),849 'seek=1' % bl0_file),
850 ('sudo -E mkimage -A arm -O linux -T kernel -C none -a %s -e %s '850 ('sudo -E mkimage -A arm -O linux -T kernel -C none -a %s -e %s '
851 '-n Linux -d %s %s/uImage' % (board_conf.load_addr,851 '-n Linux -d %s %s/uImage'
852 board_conf.load_addr, k_img_file, self.temp_bootdir_path)),852 % (board_conf.load_addr, board_conf.load_addr,
853 k_img_file, self.temp_bootdir_path)),
853 ('sudo -E mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 '854 ('sudo -E mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 '
854 '-n initramfs -d %s %s/uInitrd' % (855 '-n initramfs -d %s %s/uInitrd'
855 i_img_file, self.temp_bootdir_path))]856 % (i_img_file, self.temp_bootdir_path))]
856 self.assertEqual(expected_commands,857 self.assertEqual(expected_commands,
857 popen_fixture.mock.commands_executed)858 popen_fixture.mock.commands_executed)
858 shutil.rmtree(self.tempdir)859 shutil.rmtree(self.tempdir)
@@ -1077,7 +1078,7 @@
1077 expected = [1078 expected = [
1078 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'1079 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
1079 ' seek=%s' % (sudo_args, toc_filename,1080 ' seek=%s' % (sudo_args, toc_filename,
1080 self.snowball_config.SNOWBALL_LOADER_START_S),1081 self.snowball_config.SNOWBALL_LOADER_START_S),
1081 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'1082 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
1082 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),1083 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
1083 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'1084 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
@@ -1105,23 +1106,23 @@
1105 expected = [1106 expected = [
1106 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'1107 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
1107 ' seek=%s' % (sudo_args, toc_filename,1108 ' seek=%s' % (sudo_args, toc_filename,
1108 self.snowball_config.SNOWBALL_LOADER_START_S),1109 self.snowball_config.SNOWBALL_LOADER_START_S),
1109 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'1110 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
1110 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),1111 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
1111 '%s rm %s/boot_image_issw.bin' % (sudo_args,1112 '%s rm %s/boot_image_issw.bin' % (sudo_args,
1112 self.temp_bootdir_path),1113 self.temp_bootdir_path),
1113 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'1114 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
1114 ' bs=1 conv=notrunc seek=131588'1115 ' bs=1 conv=notrunc seek=131588'
1115 % (sudo_args, self.temp_bootdir_path),1116 % (sudo_args, self.temp_bootdir_path),
1116 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,1117 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,
1117 self.temp_bootdir_path),1118 self.temp_bootdir_path),
1118 '%s dd if=%s/mem_init.bin of=boot_device_or_file bs=512'1119 '%s dd if=%s/mem_init.bin of=boot_device_or_file bs=512'
1119 ' conv=notrunc seek=3072' % (sudo_args, self.temp_bootdir_path),1120 ' conv=notrunc seek=3072' % (sudo_args, self.temp_bootdir_path),
1120 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),1121 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),
1121 '%s dd if=%s/power_management.bin of=boot_device_or_file bs=512'1122 '%s dd if=%s/power_management.bin of=boot_device_or_file bs=512'
1122 ' conv=notrunc seek=3200' % (sudo_args, self.temp_bootdir_path),1123 ' conv=notrunc seek=3200' % (sudo_args, self.temp_bootdir_path),
1123 '%s rm %s/power_management.bin' % (sudo_args,1124 '%s rm %s/power_management.bin' % (sudo_args,
1124 self.temp_bootdir_path),1125 self.temp_bootdir_path),
1125 '%s dd if=%s/u-boot.bin of=boot_device_or_file bs=512'1126 '%s dd if=%s/u-boot.bin of=boot_device_or_file bs=512'
1126 ' conv=notrunc seek=24064' % (sudo_args, self.temp_bootdir_path),1127 ' conv=notrunc seek=24064' % (sudo_args, self.temp_bootdir_path),
1127 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),1128 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),
@@ -1142,7 +1143,7 @@
1142 expected = [1143 expected = [
1143 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'1144 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
1144 ' seek=%s' % (sudo_args, toc_filename,1145 ' seek=%s' % (sudo_args, toc_filename,
1145 board_conf.SNOWBALL_LOADER_START_S),1146 board_conf.SNOWBALL_LOADER_START_S),
1146 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'1147 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
1147 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),1148 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
1148 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'1149 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
@@ -1179,8 +1180,8 @@
1179 k_img_file, i_img_file, None)1180 k_img_file, i_img_file, None)
1180 expected = [1181 expected = [
1181 '%s mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e'1182 '%s mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e'
1182 ' 0x00008000 -n Linux -d %s %s/boot/uImage' % (sudo_args,1183 ' 0x00008000 -n Linux -d %s %s/boot/uImage'
1183 k_img_file, self.tempdir),1184 % (sudo_args, k_img_file, self.tempdir),
1184 '%s cp /tmp/temp_snowball_make_boot_files %s/boot/boot.txt'1185 '%s cp /tmp/temp_snowball_make_boot_files %s/boot/boot.txt'
1185 % (sudo_args, self.tempdir),1186 % (sudo_args, self.tempdir),
1186 '%s mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n boot'1187 '%s mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n boot'
@@ -1192,18 +1193,18 @@
1192 '%s dd if=%s/boot/boot_image_issw.bin of=boot_device_or_file'1193 '%s dd if=%s/boot/boot_image_issw.bin of=boot_device_or_file'
1193 ' bs=512 conv=notrunc seek=257' % (sudo_args, self.tempdir),1194 ' bs=512 conv=notrunc seek=257' % (sudo_args, self.tempdir),
1194 '%s rm %s/boot_image_issw.bin' % (sudo_args,1195 '%s rm %s/boot_image_issw.bin' % (sudo_args,
1195 self.temp_bootdir_path),1196 self.temp_bootdir_path),
1196 '%s dd if=%s/boot/boot_image_x-loader.bin of=boot_device_or_file'1197 '%s dd if=%s/boot/boot_image_x-loader.bin of=boot_device_or_file'
1197 ' bs=1 conv=notrunc seek=131588' % (sudo_args, self.tempdir),1198 ' bs=1 conv=notrunc seek=131588' % (sudo_args, self.tempdir),
1198 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,1199 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,
1199 self.temp_bootdir_path),1200 self.temp_bootdir_path),
1200 '%s dd if=%s/boot/mem_init.bin of=boot_device_or_file bs=512'1201 '%s dd if=%s/boot/mem_init.bin of=boot_device_or_file bs=512'
1201 ' conv=notrunc seek=3072' % (sudo_args, self.tempdir),1202 ' conv=notrunc seek=3072' % (sudo_args, self.tempdir),
1202 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),1203 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),
1203 '%s dd if=%s/boot/power_management.bin of=boot_device_or_file'1204 '%s dd if=%s/boot/power_management.bin of=boot_device_or_file'
1204 ' bs=512 conv=notrunc seek=3200' % (sudo_args, self.tempdir),1205 ' bs=512 conv=notrunc seek=3200' % (sudo_args, self.tempdir),
1205 '%s rm %s/power_management.bin' % (sudo_args,1206 '%s rm %s/power_management.bin' % (sudo_args,
1206 self.temp_bootdir_path),1207 self.temp_bootdir_path),
1207 '%s dd if=%s/boot/u-boot.bin of=boot_device_or_file bs=512'1208 '%s dd if=%s/boot/u-boot.bin of=boot_device_or_file bs=512'
1208 ' conv=notrunc seek=24064' % (sudo_args, self.tempdir),1209 ' conv=notrunc seek=24064' % (sudo_args, self.tempdir),
1209 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),1210 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),

Subscribers

People subscribed via source and target branches