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

[Para Siva]

[Para Siva (psivaa)]

review: Approve

[Para Siva (psivaa)]

review: Approve

=== modified file 'iso_static_validation.py'
--- iso_static_validation.py	2012-09-18 13:30:01 +0000
+++ iso_static_validation.py	2012-09-19 08:42:19 +0000
@@ -33,9 +33,8 @@
 import shutil
 
 # Defaults
-#DEFAULT_ISOROOT = os.path.expanduser(
-#    '/var/lib/ubuntu-server-iso-testing/isos/ubuntu/')
 DEFAULT_URL = 'http://cdimage.ubuntu.com/'
+ARCHIVE_TEST_URL = 'http://people.canonical.com/~ubuntu-archive/testing/'
 
 #constants
 ONE_MB_BLOCK = 2 ** 20
@@ -106,6 +105,9 @@
         else:
             self.fail("Image name be in the form of release-variant-arch.iso")
 
+        self.probs_url = os.path.join(ARCHIVE_TEST_URL, self.st_release +
+            '_probs.html')
+
     # Test if the sha check sum of the iso matches that is given in the server
     def test_sha256_checksum(self):
         current_iso_digest = {}
@@ -382,11 +384,19 @@
             logging.error("Failed to fetch URL '%s': %s .", report_url, e)
             self.fail("Failed to fetch report.html from  the server")
 
-        # check the number of failed packages
-        report_page_lines = re.findall('there were ["]?([^" >]+)',
+        uninst_pkgs = re.findall('"?([^" >]+ )produces uninstallable binaries',
                                        fh_report_page)
-        logging.debug('Check for conflicting packages in the report file')
-        self.assertEqual(['0'], report_page_lines)
+
+        try:
+            fh_probs_page = urllib2.urlopen(self.probs_url).read()
+        except urllib2.HTTPError, e:
+            logging.error("Failed to fetch URL '%s': %s .", self.probs_url, e)
+            self.fail("Failed to fetch problems.html from the server")
+
+        # If a package is listed in report.html and not in problems page
+        # then it's a concern and needs attention
+        for uninst_pkg in uninst_pkgs:
+            self.assertIn(uninst_pkg.rstrip(), fh_probs_page)
 
     # Test if the size of the image fits a 700MB disc
     def test_size(self):