diff mbox

[Branch,~linaro-maintainers/linaro-image-tools/trunk] Rev 298: Merge lp:~lool/linaro-image-tools/igep-support; couple of tests relative to

Message ID 20110312093333.17295.66644.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Loïc Minier March 12, 2011, 9:33 a.m. UTC 
Merge authors:
  Loïc Minier (lool)
Related merge proposals:
  https://code.launchpad.net/~lool/linaro-image-tools/igep-support/+merge/52950
  proposed by: Loïc Minier (lool)
  review: Approve - James Westby (james-w)
------------------------------------------------------------
revno: 298 [merge]
committer: Loïc Minier <lool@dooz.org>
branch nick: linaro-image-tools
timestamp: Sat 2011-03-12 10:31:11 +0100
message:
  Merge lp:~lool/linaro-image-tools/igep-support; couple of tests relative to
  IGEP.
modified:
  linaro_media_create/tests/test_media_create.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-maintainers/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_media_create/tests/test_media_create.py'
--- linaro_media_create/tests/test_media_create.py	2011-03-10 23:28:21 +0000
+++ linaro_media_create/tests/test_media_create.py	2011-03-12 09:31:11 +0000
@@ -295,6 +295,14 @@ 
             'make_boot_script', 'make_boot_ini']
         self.assertEqual(expected, self.funcs_calls)
 
+    def test_igep_steps(self):
+        self.mock_set_appropriate_serial_tty(boards.IgepConfig)
+        self.make_boot_files(boards.IgepConfig)
+        expected = [
+            'make_uImage', 'make_uInitrd', 'make_boot_script',
+            'make_boot_ini']
+        self.assertEqual(expected, self.funcs_calls)
+
     def test_overo_steps(self):
         self.mock_set_appropriate_serial_tty(boards.OveroConfig)
         self.make_boot_files(boards.OveroConfig)
@@ -488,6 +496,25 @@ 
                        'bootm 0x80000000 0x81600000'}
         self.assertEqual(expected, boot_commands)
 
+    def test_igep(self):
+        # XXX: To fix bug 697824 we have to change class attributes of our
+        # OMAP board configs, and some tests do that so to make sure they
+        # don't interfere with us we'll reset that before doing anything.
+        config = board_configs['igep']
+        config.serial_tty = config._serial_tty
+        boot_cmd = config._get_boot_env(
+            is_live=False, is_lowmem=False, consoles=[],
+            rootfs_uuid="deadbeef")
+        expected = {
+            'bootargs': 'console=tty0 console=ttyO2,115200n8  '
+                        'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
+                        'nocompcache vram=12M '
+                        'omapfb.mode=dvi:1280x720MR-16@60',
+            'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
+                       'fatload mmc 0:1 0x81600000 uInitrd; '
+                       'bootm 0x80000000 0x81600000'}
+        self.assertEqual(expected, boot_cmd)
+
     def test_overo(self):
         # XXX: To fix bug 697824 we have to change class attributes of our
         # OMAP board configs, and some tests do that so to make sure they