Merge lp:~salgado/linaro-image-tools/bug-686845 into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Fix test_run_mkimage so that it doesn't run a subprocess using sudo

[Martin Ohlsson (martin-ohlson)]

Looks good to me.

/Martin

review: Approve

=== modified file 'media_create/populate_boot.py'
--- media_create/populate_boot.py	2010-12-03 18:55:10 +0000
+++ media_create/populate_boot.py	2010-12-08 13:12:26 +0000
@@ -5,7 +5,7 @@
 
 
 def _run_mkimage(img_type, load_addr, entry_point, name, img_data, img,
-                 stdout=None):
+                 stdout=None, as_root=True):
     cmd = ['mkimage',
            '-A', 'arm',
            '-O', 'linux',
@@ -16,7 +16,7 @@
            '-n', name,
            '-d', img_data,
            img]
-    return cmd_runner.run(cmd, as_root=True, stdout=stdout)
+    return cmd_runner.run(cmd, as_root=as_root, stdout=stdout)
 
 
 def _get_file_matching(regex):

=== modified file 'media_create/tests/test_media_create.py'
--- media_create/tests/test_media_create.py	2010-12-08 03:09:51 +0000
+++ media_create/tests/test_media_create.py	2010-12-08 13:12:26 +0000
@@ -219,7 +219,7 @@
         self.assertRaises(
             ValueError, _get_file_matching, '/foo/bar/baz/*non-existent')
 
-    def DISABLED_test_run_mkimage(self):
+    def test_run_mkimage(self):
         # Create a fake boot script.
         filename = self._create_temp_file_as_fixture()
         f = open(filename, 'w')
@@ -232,7 +232,8 @@
         # want that.
         retval = _run_mkimage(
             'script', '0', '0', 'boot script', filename, img,
-            stdout=open(self._create_temp_file_as_fixture(), 'w'))
+            stdout=open(self._create_temp_file_as_fixture(), 'w'),
+            as_root=False)
 
         self.assertEqual(0, retval)