Merge lp:~lool/linaro-image-tools/igep-support into lp:linaro-image-tools/11.11

Proposed by Loïc Minier
Status: Merged
Merged at revision: 298
Proposed branch: lp:~lool/linaro-image-tools/igep-support
Merge into: lp:linaro-image-tools/11.11
Diff against target: 44 lines (+27/-0)
1 file modified
linaro_media_create/tests/test_media_create.py (+27/-0)
To merge this branch: bzr merge lp:~lool/linaro-image-tools/igep-support
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+52950@code.launchpad.net

Description of the change

Hey,

I found these tests I had in a local branch and updated them to work with the latest code.

Ideally, we'd rework the OMAP tests to share more; only the IGEP one is a bit different ATM as the boot steps aren't identical.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_media_create/tests/test_media_create.py'
2--- linaro_media_create/tests/test_media_create.py 2011-03-09 17:18:18 +0000
3+++ linaro_media_create/tests/test_media_create.py 2011-03-10 23:42:44 +0000
4@@ -295,6 +295,14 @@
5 'make_boot_script', 'make_boot_ini']
6 self.assertEqual(expected, self.funcs_calls)
7
8+ def test_igep_steps(self):
9+ self.mock_set_appropriate_serial_tty(boards.IgepConfig)
10+ self.make_boot_files(boards.IgepConfig)
11+ expected = [
12+ 'make_uImage', 'make_uInitrd', 'make_boot_script',
13+ 'make_boot_ini']
14+ self.assertEqual(expected, self.funcs_calls)
15+
16 def test_overo_steps(self):
17 self.mock_set_appropriate_serial_tty(boards.OveroConfig)
18 self.make_boot_files(boards.OveroConfig)
19@@ -488,6 +496,25 @@
20 'bootm 0x80000000 0x81600000'}
21 self.assertEqual(expected, boot_commands)
22
23+ def test_igep(self):
24+ # XXX: To fix bug 697824 we have to change class attributes of our
25+ # OMAP board configs, and some tests do that so to make sure they
26+ # don't interfere with us we'll reset that before doing anything.
27+ config = board_configs['igep']
28+ config.serial_tty = config._serial_tty
29+ boot_cmd = config._get_boot_env(
30+ is_live=False, is_lowmem=False, consoles=[],
31+ rootfs_uuid="deadbeef")
32+ expected = {
33+ 'bootargs': 'console=tty0 console=ttyO2,115200n8 '
34+ 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
35+ 'nocompcache vram=12M '
36+ 'omapfb.mode=dvi:1280x720MR-16@60',
37+ 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
38+ 'fatload mmc 0:1 0x81600000 uInitrd; '
39+ 'bootm 0x80000000 0x81600000'}
40+ self.assertEqual(expected, boot_cmd)
41+
42 def test_overo(self):
43 # XXX: To fix bug 697824 we have to change class attributes of our
44 # OMAP board configs, and some tests do that so to make sure they

Subscribers

People subscribed via source and target branches