Merge lp:~lool/linaro-image-tools/chs-align-tests into lp:linaro-image-tools/11.11

[Loïc Minier]

Use HEADS and SECTORS from partitions.py in the tests instead of hardcoding 128/32.

[Loïc Minier (lool)]

I didn't change the expected values to be computed from BOOT_MIN_SIZE_S etc. as I didn't want to duplicate all the logic to align partitions as this would basically be duplicating the bugs too I guess.

[Guilherme Salgado (salgado)]

On Thu, 2011-03-17 at 18:33 +0000, Loïc Minier wrote:
> I didn't change the expected values to be computed from BOOT_MIN_SIZE_S etc. as I didn't want to duplicate all the logic to align partitions as this would basically be duplicating the bugs too I guess.

I don't see what you mean here, but the changes look good. Thanks!

 review approve

review: Approve

[Loïc Minier (lool)]

For instance, we could compute the expected offsets from constants such as PART_ALIGN, BOOT_MIN_SIZE etc. in tests which look at the sfdisk commands, but this would duplicate logic

=== modified file 'linaro_media_create/tests/test_media_create.py'
--- linaro_media_create/tests/test_media_create.py	2011-03-12 09:31:11 +0000
+++ linaro_media_create/tests/test_media_create.py	2011-03-17 18:32:33 +0000
@@ -67,6 +67,8 @@
     temporarily_overwrite_file_on_dir,
     )
 from linaro_media_create.partitions import (
+    HEADS,
+    SECTORS,
     calculate_partition_size_and_offset,
     convert_size_to_bytes,
     create_partitions,
@@ -770,7 +772,7 @@
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
-        create_partitions(boards.Mx5Config, self.media, 128, 32, '')
+        create_partitions(boards.Mx5Config, self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -780,8 +782,8 @@
         # every time we run sfdisk it actually repartitions the device,
         # erasing any partitions created previously.
         self.assertEqual(
-            [('1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-', 128, 32, '',
-              self.media.path)],
+            [('1,8191,0xDA\n8192,106496,0x0C,*\n114688,,,-', HEADS, SECTORS,
+              '', self.media.path)],
             sfdisk_fixture.mock.calls)
 
     def test_create_partitions_for_smdkv310(self):
@@ -790,7 +792,7 @@
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
         create_partitions(
-            board_configs['smdkv310'], self.media, 128, 32, '')
+            board_configs['smdkv310'], self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
@@ -800,22 +802,23 @@
         # every time we run sfdisk it actually repartitions the device,
         # erasing any partitions created previously.
         self.assertEqual(
-            [('1,221183,0xDA\n221184,106496,0x0C,*\n327680,,,-', 128, 32, '',
-              self.media.path)], sfdisk_fixture.mock.calls)
+            [('1,221183,0xDA\n221184,106496,0x0C,*\n327680,,,-', HEADS,
+              SECTORS, '', self.media.path)], sfdisk_fixture.mock.calls)
 
     def test_create_partitions_for_beagle(self):
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
         sfdisk_fixture = self.useFixture(MockRunSfdiskCommandsFixture())
 
         create_partitions(
-            board_configs['beagle'], self.media, 128, 32, '')
+            board_configs['beagle'], self.media, HEADS, SECTORS, '')
 
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, self.media.path),
              'sync'],
             popen_fixture.mock.commands_executed)
         self.assertEqual(
-            [('63,106432,0x0C,*\n106496,,,-', 128, 32, '', self.media.path)],
+            [('63,106432,0x0C,*\n106496,,,-', HEADS, SECTORS, '',
+              self.media.path)],
             sfdisk_fixture.mock.calls)
 
     def test_create_partitions_with_img_file(self):
@@ -824,7 +827,7 @@
 
         tmpfile = self.createTempFileAsFixture()
         create_partitions(
-            board_configs['beagle'], Media(tmpfile), 128, 32, '')
+            board_configs['beagle'], Media(tmpfile), HEADS, SECTORS, '')
 
         # Unlike the test for partitioning of a regular block device, in this
         # case parted was not called as there's no existing partition table
@@ -832,7 +835,7 @@
         self.assertEqual(['sync'], popen_fixture.mock.commands_executed)
 
         self.assertEqual(
-            [('63,106432,0x0C,*\n106496,,,-', 128, 32, '', tmpfile)],
+            [('63,106432,0x0C,*\n106496,,,-', HEADS, SECTORS, '', tmpfile)],
             sfdisk_fixture.mock.calls)
 
     def test_run_sfdisk_commands(self):
@@ -842,7 +845,7 @@
             stdout=subprocess.PIPE)
         proc.communicate()
         stdout, stderr = run_sfdisk_commands(
-            '2,16063,0xDA', 128, 32, '', tmpfile, as_root=False,
+            '2,16063,0xDA', HEADS, SECTORS, '', tmpfile, as_root=False,
             stderr=subprocess.PIPE)
         self.assertIn('Successfully wrote the new partition table', stdout)
 
@@ -851,7 +854,7 @@
         self.assertRaises(
             cmd_runner.SubcommandNonZeroReturnValue,
             run_sfdisk_commands,
-            ',1,0xDA', 128, 32, '', tmpfile, as_root=False,
+            ',1,0xDA', HEADS, SECTORS, '', tmpfile, as_root=False,
             stderr=subprocess.PIPE)
 
 
@@ -929,7 +932,7 @@
             stdout=subprocess.PIPE)
         proc.communicate()
         stdout, stderr = run_sfdisk_commands(
-            sfdisk_commands, 128, 32, '', tmpfile, as_root=False,
+            sfdisk_commands, HEADS, SECTORS, '', tmpfile, as_root=False,
             # Throw away stderr as sfdisk complains a lot when operating on a
             # qemu image.
             stderr=subprocess.PIPE)
@@ -1009,8 +1012,8 @@
              # This is the call that would create a 2 GiB image file.
             ['qemu-img create -f raw %s 2147483648' % tmpfile,
              # This call would partition the image file.
-             '%s sfdisk --force -D -uS -H 128 -S 32 -C 1024 %s' % (
-                 sudo_args, tmpfile),
+             '%s sfdisk --force -D -uS -H %s -S %s -C 1024 %s' % (
+                 sudo_args, HEADS, SECTORS, tmpfile),
              # Make sure changes are written to disk.
              'sync',
              '%s mkfs.vfat -F 32 %s -n boot' % (sudo_args, bootfs_dev),
@@ -1036,8 +1039,8 @@
             True, True, True)
         self.assertEqual(
             ['%s parted -s %s mklabel msdos' % (sudo_args, tmpfile),
-             '%s sfdisk --force -D -uS -H 128 -S 32 %s' % (
-                 sudo_args, tmpfile),
+             '%s sfdisk --force -D -uS -H %s -S %s %s' % (
+                 sudo_args, HEADS, SECTORS, tmpfile),
              'sync',
              # Since the partitions are mounted, setup_partitions will umount
              # them before running mkfs.