diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-04-04 11:12:38 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-04-04 11:12:38 +0300 |
| commit | b56ba8cceeb3a79a75e65b29246a60c55b46caf8 (patch) | |
| tree | 29952240a714407362859ebdce63b5c2db93c848 /linaro_image_tools/media_create/tests | |
| parent | dd04d96e9e641c75295db2f115dddd25e5cdb5d6 (diff) | |
| parent | f2d720ea4972e27c51b447d25c0c771f08a576fc (diff) | |
Merge trunk
Diffstat (limited to 'linaro_image_tools/media_create/tests')
| -rw-r--r-- | linaro_image_tools/media_create/tests/test_android_boards.py | 8 | ||||
| -rw-r--r-- | linaro_image_tools/media_create/tests/test_media_create.py | 38 |
2 files changed, 23 insertions, 23 deletions
diff --git a/linaro_image_tools/media_create/tests/test_android_boards.py b/linaro_image_tools/media_create/tests/test_android_boards.py index 758aa94..c1b5bb4 100644 --- a/linaro_image_tools/media_create/tests/test_android_boards.py +++ b/linaro_image_tools/media_create/tests/test_android_boards.py @@ -489,10 +489,10 @@ class TestAndroidBoardsHwpack(TestCaseWithFixtures): 'init=/init androidboot.console=ttySAC2 ' 'console=ttySAC2 initrd=0x41000000', 'bootcmd': 'fatload mmc 0:1 0x40007000 uImage; fatload mmc 0:1 ' - '0x41000000 uInitrd; fatload mmc 0:1 0x41f00000 ' - 'exynos5250-arndale.dtb; bootm 0x40007000 0x41000000 ' - '0x41f00000', + '0x41000000 uInitrd; fatload mmc 0:1 0x41f00000 ' + 'exynos5250-arndale.dtb; bootm 0x40007000 0x41000000 ' + '0x41f00000', 'fdt_high': '0xffffffff', 'initrd_high': '0xffffffff', - } + } self.assertBootEnv(expected, board='arndale') diff --git a/linaro_image_tools/media_create/tests/test_media_create.py b/linaro_image_tools/media_create/tests/test_media_create.py index 8709e1b..48f9740 100644 --- a/linaro_image_tools/media_create/tests/test_media_create.py +++ b/linaro_image_tools/media_create/tests/test_media_create.py @@ -1525,8 +1525,8 @@ class TestPopulateRawPartition(TestCaseWithFixtures): def test_origen_quad_raw(self): # Need to mock this since files do not exist here, and # an Exception is raised. - self.useFixture(MockSomethingFixture(os.path, 'exists', - lambda exists: True)) + self.useFixture( + MockSomethingFixture(os.path, 'exists', lambda exists: True)) self.populate_raw_partition(boards.OrigenQuadConfig()) expected = ['_dd', '_dd', '_dd', '_dd', '_dd'] @@ -1534,8 +1534,8 @@ class TestPopulateRawPartition(TestCaseWithFixtures): def test_origen_quad_raises(self): board_conf = boards.OrigenQuadConfig() - self.assertRaises(boards.BoardException, - board_conf.populate_raw_partition, '', '') + self.assertRaises( + boards.BoardException, board_conf.populate_raw_partition, '', '') def test_arndale_raw(self): self.useFixture(MockSomethingFixture(os.path, 'getsize', @@ -1659,20 +1659,20 @@ class TestPopulateRawPartitionAndroid(TestCaseWithFixtures): fixture = MockCmdRunnerPopenFixture() self.useFixture(fixture) expected_commands = [ - ('sudo -E dd if=/dev/zero of= bs=512 conv=notrunc count=32 ' - 'seek=1601'), - ('sudo -E dd if=boot/origen_quad.bl1.bin of= bs=512 ' - 'conv=notrunc seek=1'), - ('sudo -E dd if=boot/origen_quad-spl.bin.signed of= bs=512 ' - 'conv=notrunc seek=31'), - ('sudo -E dd if=boot/u-boot.bin of= bs=512 conv=notrunc ' - 'seek=63'), - ('sudo -E dd if=boot/exynos4x12.tzsw.signed.img of= bs=512 ' - 'conv=notrunc seek=761') - ] + ('sudo -E dd if=/dev/zero of= bs=512 conv=notrunc count=32 ' + 'seek=1601'), + ('sudo -E dd if=boot/origen_quad.bl1.bin of= bs=512 ' + 'conv=notrunc seek=1'), + ('sudo -E dd if=boot/origen_quad-spl.bin.signed of= bs=512 ' + 'conv=notrunc seek=31'), + ('sudo -E dd if=boot/u-boot.bin of= bs=512 conv=notrunc ' + 'seek=63'), + ('sudo -E dd if=boot/exynos4x12.tzsw.signed.img of= bs=512 ' + 'conv=notrunc seek=761') + ] - self.useFixture(MockSomethingFixture(os.path, 'exists', - lambda exists: True)) + self.useFixture( + MockSomethingFixture(os.path, 'exists', lambda exists: True)) self.populate_raw_partition(android_boards.AndroidOrigenQuadConfig()) expected = [] @@ -2127,8 +2127,8 @@ class TestGetBootCmd(TestCase): 'mem_modem=32M@96M mem=44M@128M pmem=22M@172M ' 'mem=30M@194M mem_mali=32M@224M pmem_hwb=54M@256M ' 'hwmem=48M@302M mem=152M@360M', - 'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; ' - 'fatload mmc 1:1 0x08000000 uInitrd; ' + 'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; ' + 'fatload mmc 0:2 0x08000000 uInitrd; ' 'bootm 0x00100000 0x08000000', 'fdt_high': '0xffffffff', 'initrd_high': '0xffffffff'} |