Merge lp:~pwlars/qa-iso-static-validation-test/typos into lp:qa-iso-static-validation-test

[Paul Larson]

*cough* :)

[Paul Larson (pwlars)]

obvious changes, self-approving and just submitting the MP for your awareness.

review: Approve

=== modified file 'iso_static_validation.py'
--- iso_static_validation.py	2012-09-21 16:07:47 +0000
+++ iso_static_validation.py	2012-09-21 22:11:20 +0000
@@ -32,13 +32,13 @@
 import shutil
 
 
-
 class TestValidateISO(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         # Defaults
         cls.DEFAULT_URL = 'http://cdimage.ubuntu.com/'
-        cls.ARCHIVE_TEST_URL = 'http://people.canonical.com/~ubuntu-archive/testing/'
+        cls.ARCHIVE_TEST_URL = ('http://people.canonical.com/~ubuntu-archive'
+                                '/testing/')
 
         #constants
         cls.ONE_MB_BLOCK = 2 ** 20
@@ -46,9 +46,8 @@
         cls.QUANTAL_SIZE_LIMIT_MB = 838860800
 
         #Read the iso name and initialise global variables
-        cls.isoroot=os.getenv('ISOROOT')
-        cls.name=os.getenv('ISONAME')
-
+        cls.isoroot = os.getenv('ISOROOT')
+        cls.name = os.getenv('ISONAME')
 
         if cls.name == None or '.iso' not in cls.name or cls.isoroot == None:
             print("Please see the README")
@@ -56,9 +55,12 @@
         else:
             cls.st_name = cls.name.rstrip('.iso')
             try:
-                (cls.st_release, cls.st_variant, cls.st_arch) = cls.st_name.rsplit('-')
+                (cls.st_release,
+                 cls.st_variant,
+                 cls.st_arch) = cls.st_name.rsplit('-')
             except ValueError:
-                sys.exit("Image name must be in the form of release-variant-arch.iso")
+                sys.exit("Image name must be in the form of "
+                         "release-variant-arch.iso")
 
         #Set a flag for ubiquity based images
         if cls.st_variant == 'desktop' or cls.st_variant == 'dvd':
@@ -70,7 +72,7 @@
         except OSError:
             print("Creating temp dirrectory failed")
             raise
-        
+
     def setUp(self):
         self.iso_name = self.name
         self.block_size = self.ONE_MB_BLOCK
@@ -92,7 +94,8 @@
                 self.url = os.path.join(self.DEFAULT_URL, 'ubuntu-server',
                                         'precise', 'daily')
             else:  # current dev release
-                self.url = os.path.join(self.DEFAULT_URL, 'ubuntu-server', 'daily')
+                self.url = os.path.join(
+                    self.DEFAULT_URL, 'ubuntu-server', 'daily')
         else:
             self.fail("Image name be in the form of release-variant-arch.iso")
 
@@ -108,7 +111,7 @@
         except urllib2.HTTPError, e:
             self.fail(
                 "Failed to fetch URL '{0}': {1}. Aborting!".format(
-                ha256sum_url, e))
+                sha256sum_url, e))
 
         # Process the file (contains a number of entries containing iso
         # names and the corresponding checksums)
@@ -121,7 +124,7 @@
             iso_sha256 = current_iso_digest[self.iso_name]
         except KeyError:
             self.fail("No digest found for image '{0}'".format(
-                elf.iso_name))
+                self.iso_name))
 
         # Validate checksum of file fname against sha256 hash
         sha256 = hashlib.sha256()
@@ -168,7 +171,7 @@
 
     # Test if the manfest is the same as that is given in the server
     def test_manifest(self):
-        if(self.ubiquity_image==False):
+        if(self.ubiquity_image == False):
             self.skipTest("manifest only for ubiquity based images")
         manifest_url = os.path.join(self.url, 'current',
                                     self.st_release + '-' +
@@ -179,8 +182,8 @@
         except urllib2.HTTPError, e:
             logging.error("Failed to fetch URL '%s': %s . Aborting!",
                           manifest_url, e)
-            self.fail(
-                "Failed to fetch manifest file from the server:\n{0}".format(e))
+            self.fail("Failed to fetch manifest file from the "
+                      "server:\n{0}".format(e))
 
         cmd = ["bsdtar", "-xf", self.iso_location, "-C", self.temp_dir,
                "casper/filesystem.manifest"]
@@ -377,8 +380,8 @@
             logging.error("Failed to fetch URL '%s': %s .", report_url, e)
             self.fail("Failed to fetch report.html from  the server")
 
-        uninst_pkgs = re.findall('"?([^" >]+ )produces uninstallable binaries',
-                                       fh_report_page)
+        uninst_pkgs = re.findall(
+            '"?([^" >]+ )produces uninstallable binaries', fh_report_page)
 
         try:
             fh_probs_page = urllib2.urlopen(self.probs_url).read()