Merge lp:~psivaa/qa-iso-static-validation-test/vmlinuz_fix_for_amd64 into lp:qa-iso-static-validation-test

[Para Siva]

vmlinuz renaming on amd64 images are adopted on test_vmlinuz test.

[Paul Larson (pwlars)]

+1

review: Approve

=== modified file 'iso_static_validation.py'
--- iso_static_validation.py	2012-11-29 16:54:39 +0000
+++ iso_static_validation.py	2012-12-05 15:56:41 +0000
@@ -316,16 +316,22 @@
     def test_vmlinuz(self):
         if(self.ubiquity_image == False or self.st_arch == 'powerpc'):
             self.skipTest("vmlinuz is present only for ubiquity based images")
-        cmd = ["bsdtar", "-xf", self.iso_location, "-C",
-                                self.temp_dir, "casper/vmlinuz"]
+        kernel_name = "casper/vmlinuz"
+
+        if self.st_arch == 'amd64':
+            kernel_name = "casper/vmlinuz.efi"
+
+        cmd = ["bsdtar", "-xf", self.iso_location, "-C",     
+                                self.temp_dir, kernel_name]
+
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)
         (stdout, stderr) = output.communicate()
         logging.debug('Asserting that vmlinuz is present in the iso')
         self.assertEqual(stderr, '')
 
-        vmlinuz_path = os.path.join(self.temp_dir, 'casper/vmlinuz')
-
+        vmlinuz_path = os.path.join(self.temp_dir, kernel_name)        
+        
         cmd = ["file", vmlinuz_path]
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                   stderr=subprocess.PIPE)