Merge lp:~xnox/utah/iso-static-analysis-updates into lp:utah

[Dimitri John Ledkov]

This is incremental update on top of lp:~nuclearbob/utah/iso-static-analysis-updates

Tested against both current raring & precise daily.

[Max Brustkern (nuclearbob)]

I updated https://code.launchpad.net/+branch/~nuclearbob/utah/iso-static-analysis-updates It now uses a method we already had in the code to check bootloader configuration files to fine the kernel on desktop images. It also updates the test to work with server images.

[Javier Collado (javier.collado)]

Since Dmitrijs already approved the update in the other merge request, I'm
rejecting this one to clean up the list of pending merge proposals.

review: Disapprove

Unmerged revisions

772. By Dimitri John Ledkov on 2012-12-05

Find any vmlinuz regardless of distro series.

=== modified file 'utah/iso.py'
--- utah/iso.py	2012-11-30 12:05:01 +0000
+++ utah/iso.py	2012-12-05 17:59:35 +0000
@@ -191,7 +191,8 @@
                     cmd = ['bsdtar', '-x', '-f', self.image, '-C', outdir,
                            '-O', realfile]
         except IndexError:
-            raise UTAHException('Cannot unpack image: ' + self.image)
+            raise UTAHException('Cannot unpack {path} from {image}'
+                                .format(path=filename, image=self.image))
         self.logger.debug('bsdtar extract command: ' + ' '.join(cmd))
         return cmd
 
@@ -244,7 +245,7 @@
         """
         for myfile in self.listfiles(returnlist=True):
             self.extract(myfile)
-            
+
     def getmd5(self, path):
         """
         Return the md5 checksum of a file.
@@ -260,7 +261,7 @@
         filemd5 = isohash.hexdigest()
         self.logger.debug('md5 of ' + path + ' is ' + filemd5)
         return filemd5
-        
+
     def downloadiso(self, arch=None, installtype=None, series=None):
         """
         Download an ISO given series, type, and arch.
@@ -339,7 +340,8 @@
             isopath = os.path.join(remotepath, isofile)
             self.percent = 0
             self.logger.info('Attempting to download ' + isopath)
-            temppath = urllib.urlretrieve(isopath, reporthook=self.dldisplay)[0]
+            temppath = urllib.urlretrieve(isopath,
+                                          reporthook=self.dldisplay)[0]
 
             # Try to copy it into our cache
             self.logger.debug('Copying ' + temppath + ' to ' + path)

=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py	2012-11-27 18:11:39 +0000
+++ utah/isotest/iso_static_validation.py	2012-12-05 17:59:35 +0000
@@ -28,6 +28,7 @@
 import logging
 import urllib2
 import subprocess
+import glob
 import hashlib
 import unittest
 import re
@@ -37,7 +38,6 @@
 lib_path = os.path.abspath('../')
 sys.path.append(lib_path)
 from utah.iso import ISO
-from utah import config
 
 
 # Defaults
@@ -76,7 +76,7 @@
     ubiquity_image = True
 else:
     ubiquity_image = False
-    
+
 #Setup the path for data files
 DATA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'data')
 
@@ -248,7 +248,7 @@
 
     # Test if  wubi is present for desktop or dvd and it is a valid PE
     @unittest.skipUnless(st_variant == 'desktop' and
-                         st_arch != 'powerpc' and st_release < 'raring', 
+                         st_arch != 'powerpc' and st_release < 'raring',
                          "Skipping images that aren't ubiquity-based and "
                          "older than raring")
     def test_wubi(self):
@@ -320,7 +320,7 @@
         if self.st_release >= 'q':
             # cdromupgrade is not shipped in quantal
             exclude_files.append('cdromupgrade')
-            
+
         for list_server in files_list:
             logging.debug('check if important d-i files are present in iso')
             path = list_server.rstrip()
@@ -333,11 +333,12 @@
     @unittest.skipUnless(ubiquity_image and st_arch != 'powerpc',
                          "vmlinuz is present only for ubiquity based images")
     def test_vmlinuz(self):
-        (stdout, stderr) = self.iso.extract('casper/vmlinuz', self.temp_dir)
+        path = 'casper/vmlinuz*'
+        (stdout, stderr) = self.iso.extract(path, self.temp_dir)
         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 = glob.glob(os.path.join(self.temp_dir, path))[0]
 
         cmd = ["file", vmlinuz_path]
         output = subprocess.Popen(cmd, stdout=subprocess.PIPE,