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
1=== modified file 'linaro_image_tools/hwpack/tests/test_config_v3.py'
2--- linaro_image_tools/hwpack/tests/test_config_v3.py 2013-02-17 13:53:41 +0000
3+++ linaro_image_tools/hwpack/tests/test_config_v3.py 2013-07-25 08:02:32 +0000
4@@ -853,7 +853,7 @@
5 ' - adest.dtb : boot/dt-*-linaro-omap/omap4-panda.dtb\n' +
6 ' - bdest.dtb : ' +
7 'boot/dt-*-linaro-omap2/omap4-panda2.dtb\n')
8- expected = [{'adest.dtb':'boot/dt-*-linaro-omap/omap4-panda.dtb'},
9+ expected = [{'adest.dtb': 'boot/dt-*-linaro-omap/omap4-panda.dtb'},
10 {'bdest.dtb': 'boot/dt-*-linaro-omap2/omap4-panda2.dtb'}]
11 config = self.get_config(self.valid_complete_v3 + dtb_files)
12 config.validate()
13
14=== modified file 'linaro_image_tools/media_create/boards.py'
15--- linaro_image_tools/media_create/boards.py 2013-06-28 13:09:08 +0000
16+++ linaro_image_tools/media_create/boards.py 2013-07-25 08:02:32 +0000
17@@ -1533,14 +1533,14 @@
18 seek=self.samsung_env_start)
19 # Populate created raw partition with BL1 and u-boot
20 spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')
21- assert os.path.getsize(spl_file) <= (
22- self.samsung_bl1_len * SECTOR_SIZE), (
23- "%s is larger than Samsung BL1 size" % spl_file)
24+ assert os.path.getsize(spl_file) <= \
25+ (self.samsung_bl1_len * SECTOR_SIZE), \
26+ ("%s is larger than Samsung BL1 size" % spl_file)
27 _dd(spl_file, boot_device_or_file, seek=self.samsung_bl1_start)
28 uboot_file = os.path.join(chroot_dir, 'boot', 'u-boot.bin')
29- assert os.path.getsize(uboot_file) <= (
30- self.samsung_bl2_len * SECTOR_SIZE), (
31- "%s is larger than Samsung BL2 size" % uboot_file)
32+ assert os.path.getsize(uboot_file) <= \
33+ (self.samsung_bl2_len * SECTOR_SIZE), \
34+ ("%s is larger than Samsung BL2 size" % uboot_file)
35 _dd(uboot_file, boot_device_or_file, seek=self.samsung_bl2_start)
36
37
38
39=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
40--- linaro_image_tools/media_create/tests/test_media_create.py 2013-06-27 09:04:20 +0000
41+++ linaro_image_tools/media_create/tests/test_media_create.py 2013-07-25 08:02:32 +0000
42@@ -848,11 +848,12 @@
43 ('sudo -E dd if=%s of=boot_device_or_file bs=512 conv=notrunc '
44 'seek=1' % bl0_file),
45 ('sudo -E mkimage -A arm -O linux -T kernel -C none -a %s -e %s '
46- '-n Linux -d %s %s/uImage' % (board_conf.load_addr,
47- board_conf.load_addr, k_img_file, self.temp_bootdir_path)),
48+ '-n Linux -d %s %s/uImage'
49+ % (board_conf.load_addr, board_conf.load_addr,
50+ k_img_file, self.temp_bootdir_path)),
51 ('sudo -E mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 '
52- '-n initramfs -d %s %s/uInitrd' % (
53- i_img_file, self.temp_bootdir_path))]
54+ '-n initramfs -d %s %s/uInitrd'
55+ % (i_img_file, self.temp_bootdir_path))]
56 self.assertEqual(expected_commands,
57 popen_fixture.mock.commands_executed)
58 shutil.rmtree(self.tempdir)
59@@ -1077,7 +1078,7 @@
60 expected = [
61 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
62 ' seek=%s' % (sudo_args, toc_filename,
63- self.snowball_config.SNOWBALL_LOADER_START_S),
64+ self.snowball_config.SNOWBALL_LOADER_START_S),
65 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
66 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
67 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
68@@ -1105,23 +1106,23 @@
69 expected = [
70 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
71 ' seek=%s' % (sudo_args, toc_filename,
72- self.snowball_config.SNOWBALL_LOADER_START_S),
73+ self.snowball_config.SNOWBALL_LOADER_START_S),
74 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
75 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
76 '%s rm %s/boot_image_issw.bin' % (sudo_args,
77- self.temp_bootdir_path),
78+ self.temp_bootdir_path),
79 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
80 ' bs=1 conv=notrunc seek=131588'
81 % (sudo_args, self.temp_bootdir_path),
82 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,
83- self.temp_bootdir_path),
84+ self.temp_bootdir_path),
85 '%s dd if=%s/mem_init.bin of=boot_device_or_file bs=512'
86 ' conv=notrunc seek=3072' % (sudo_args, self.temp_bootdir_path),
87 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),
88 '%s dd if=%s/power_management.bin of=boot_device_or_file bs=512'
89 ' conv=notrunc seek=3200' % (sudo_args, self.temp_bootdir_path),
90 '%s rm %s/power_management.bin' % (sudo_args,
91- self.temp_bootdir_path),
92+ self.temp_bootdir_path),
93 '%s dd if=%s/u-boot.bin of=boot_device_or_file bs=512'
94 ' conv=notrunc seek=24064' % (sudo_args, self.temp_bootdir_path),
95 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),
96@@ -1142,7 +1143,7 @@
97 expected = [
98 '%s dd if=%s of=boot_device_or_file bs=512 conv=notrunc'
99 ' seek=%s' % (sudo_args, toc_filename,
100- board_conf.SNOWBALL_LOADER_START_S),
101+ board_conf.SNOWBALL_LOADER_START_S),
102 '%s dd if=%s/boot_image_issw.bin of=boot_device_or_file bs=512'
103 ' conv=notrunc seek=257' % (sudo_args, self.temp_bootdir_path),
104 '%s dd if=%s/boot_image_x-loader.bin of=boot_device_or_file'
105@@ -1179,8 +1180,8 @@
106 k_img_file, i_img_file, None)
107 expected = [
108 '%s mkimage -A arm -O linux -T kernel -C none -a 0x00008000 -e'
109- ' 0x00008000 -n Linux -d %s %s/boot/uImage' % (sudo_args,
110- k_img_file, self.tempdir),
111+ ' 0x00008000 -n Linux -d %s %s/boot/uImage'
112+ % (sudo_args, k_img_file, self.tempdir),
113 '%s cp /tmp/temp_snowball_make_boot_files %s/boot/boot.txt'
114 % (sudo_args, self.tempdir),
115 '%s mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n boot'
116@@ -1192,18 +1193,18 @@
117 '%s dd if=%s/boot/boot_image_issw.bin of=boot_device_or_file'
118 ' bs=512 conv=notrunc seek=257' % (sudo_args, self.tempdir),
119 '%s rm %s/boot_image_issw.bin' % (sudo_args,
120- self.temp_bootdir_path),
121+ self.temp_bootdir_path),
122 '%s dd if=%s/boot/boot_image_x-loader.bin of=boot_device_or_file'
123 ' bs=1 conv=notrunc seek=131588' % (sudo_args, self.tempdir),
124 '%s rm %s/boot_image_x-loader.bin' % (sudo_args,
125- self.temp_bootdir_path),
126+ self.temp_bootdir_path),
127 '%s dd if=%s/boot/mem_init.bin of=boot_device_or_file bs=512'
128 ' conv=notrunc seek=3072' % (sudo_args, self.tempdir),
129 '%s rm %s/mem_init.bin' % (sudo_args, self.temp_bootdir_path),
130 '%s dd if=%s/boot/power_management.bin of=boot_device_or_file'
131 ' bs=512 conv=notrunc seek=3200' % (sudo_args, self.tempdir),
132 '%s rm %s/power_management.bin' % (sudo_args,
133- self.temp_bootdir_path),
134+ self.temp_bootdir_path),
135 '%s dd if=%s/boot/u-boot.bin of=boot_device_or_file bs=512'
136 ' conv=notrunc seek=24064' % (sudo_args, self.tempdir),
137 '%s rm %s/u-boot.bin' % (sudo_args, self.temp_bootdir_path),

Subscribers

People subscribed via source and target branches