Merge lp:~jibel/utah/fixed_iso_validation_test_vmlinuz into lp:utah

[Jean-Baptiste Lallement]

On trusty 'file' returns a different signature for the kernel than other release. This patch addresses this special case.

On trusty 'file' returns a different signature for the kernel than other release. This patch addresses this special case.

[Para Siva (psivaa)]

Thanks for working on it jibel

review: Approve

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2013-06-21 15:59:24 +0000
+++ utah/isotest/iso_static_validation.py	2014-07-15 09:54:29 +0000
@@ -382,13 +382,21 @@
         logging.debug('Extract kernel image from the iso')
         path = iso.kernelpath()
         vmlinuz_path = self.iso.extract(path, self.temp_dir)
+
+        # In Trusty the type returned by file for the kernel is different from
+        # other releases
+        host_release = subprocess.check_output(['lsb_release', '-sc'])
+        kernel_string = 'Linux kernel'
+        if 'trusty' in host_release:
+            kernel_string = 'x86 boot sector'
+
         cmd = ['file', vmlinuz_path]
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)
         (stdout, stderr) = output.communicate()
         logging.debug('Check if vmlinuz present in the iso is a Linux kernel')
         self.assertEqual(stderr, '')
-        self.assertIn('Linux kernel', stdout)
+        self.assertIn(kernel_string, stdout)
 
     @unittest.skipUnless(ubiquity_image or
                          (st_variant == 'server' and st_release > 'precise'),