Merge lp:~salgado/linaro-image-tools/fix-tests into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Fix 3 tests that I broke with my last commit.

[James Westby (james-w)]

review: Approve

=== modified file 'linaro_media_create/tests/test_media_create.py'
--- linaro_media_create/tests/test_media_create.py	2011-01-13 00:00:49 +0000
+++ linaro_media_create/tests/test_media_create.py	2011-01-14 20:30:08 +0000
@@ -425,6 +425,9 @@
         self.useFixture(MockSomethingFixture(
             partitions, '_get_partition_count', lambda media: 2))
         tempfile = self._create_qemu_img_with_partitions(',1,0x0C,*\n,,,-')
+        self.useFixture(MockSomethingFixture(
+            partitions, '_get_device_file_for_partition_number',
+            lambda dev, partition: '%s%d' % (tempfile, partition)))
         media = Media(tempfile)
         # Pretend the image file is a block device, or else
         # get_boot_and_root_partitions_for_media will choke.
@@ -438,6 +441,9 @@
             partitions, '_get_partition_count', lambda media: 3))
         tempfile = self._create_qemu_img_with_partitions(
             ',1,0xDA\n,1,0x0C,*\n,,,-')
+        self.useFixture(MockSomethingFixture(
+            partitions, '_get_device_file_for_partition_number',
+            lambda dev, partition: '%s%d' % (tempfile, partition)))
         media = Media(tempfile)
         # Pretend the image file is a block device, or else
         # get_boot_and_root_partitions_for_media will choke.
@@ -542,6 +548,9 @@
         self.useFixture(MockSomethingFixture(
             partitions, 'is_partition_mounted', lambda part: True))
         tempfile = self._create_qemu_img_with_partitions(',1,0x0C,*\n,,,-')
+        self.useFixture(MockSomethingFixture(
+            partitions, '_get_device_file_for_partition_number',
+            lambda dev, partition: '%s%d' % (tempfile, partition)))
         media = Media(tempfile)
         # Pretend our tempfile is a block device.
         media.is_block_device = True